diff options
author | Alan Somers <asomers@gmail.com> | 2021-06-12 13:12:10 -0600 |
---|---|---|
committer | Alan Somers <asomers@gmail.com> | 2021-07-07 20:49:29 -0600 |
commit | 2d796eba380e8f4e5d935b6b356c9d401917b92d (patch) | |
tree | 7b344bb84c5e8a6957f46490e151551b09ce7f1b /src/sys/ptrace | |
parent | 6511d02414ec9dd4bcaa237336c5f74869e6c41a (diff) | |
download | nix-2d796eba380e8f4e5d935b6b356c9d401917b92d.zip |
Collapse Error into Errno
Now that Nix's weird error types are eliminated, there's no reason not
to simply use Errno as the Error type.
Diffstat (limited to 'src/sys/ptrace')
-rw-r--r-- | src/sys/ptrace/linux.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sys/ptrace/linux.rs b/src/sys/ptrace/linux.rs index 3ac48097..4ac43936 100644 --- a/src/sys/ptrace/linux.rs +++ b/src/sys/ptrace/linux.rs @@ -2,7 +2,7 @@ use cfg_if::cfg_if; use std::{mem, ptr}; -use crate::{Error, Result}; +use crate::Result; use crate::errno::Errno; use libc::{self, c_void, c_long, siginfo_t}; use crate::unistd::Pid; @@ -180,7 +180,7 @@ fn ptrace_peek(request: Request, pid: Pid, addr: AddressType, data: *mut c_void) libc::ptrace(request as RequestType, libc::pid_t::from(pid), addr, data) }; match Errno::result(ret) { - Ok(..) | Err(Error(Errno::UnknownErrno)) => Ok(ret), + Ok(..) | Err(Errno::UnknownErrno) => Ok(ret), err @ Err(..) => err, } } |