diff options
author | Alan Somers <asomers@gmail.com> | 2021-09-19 08:29:31 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-19 08:29:31 -0600 |
commit | 515e99bcffcf324d03128649f3ee0ca14d67b5b1 (patch) | |
tree | 654a84d639d1feca971396f958f7589fc1fb81bf /src/sys/signal.rs | |
parent | f0d6d0406d8e763619aecac062d1d2b56ca6e7b2 (diff) | |
parent | a09b1c8ac643d448db479a108ac6726307075453 (diff) | |
download | nix-515e99bcffcf324d03128649f3ee0ca14d67b5b1.zip |
Merge pull request #1529 from asomers/clippy-9-2021
Clippy cleanup
Diffstat (limited to 'src/sys/signal.rs')
-rw-r--r-- | src/sys/signal.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sys/signal.rs b/src/sys/signal.rs index 1011930f..e8c79d33 100644 --- a/src/sys/signal.rs +++ b/src/sys/signal.rs @@ -156,7 +156,7 @@ impl FromStr for Signal { target_os = "fuchsia", target_os = "linux", target_os = "redox")))] "SIGINFO" => Signal::SIGINFO, - _ => return Err(Error::from(Errno::EINVAL)), + _ => return Err(Errno::EINVAL), }) } } @@ -779,7 +779,7 @@ pub unsafe fn signal(signal: Signal, handler: SigHandler) -> Result<SigHandler> SigHandler::SigIgn => libc::signal(signal, libc::SIG_IGN), SigHandler::Handler(handler) => libc::signal(signal, handler as libc::sighandler_t), #[cfg(not(target_os = "redox"))] - SigHandler::SigAction(_) => return Err(Error::from(Errno::ENOTSUP)), + SigHandler::SigAction(_) => return Err(Errno::ENOTSUP), }; Errno::result(res).map(|oldhandler| { match oldhandler { @@ -1091,7 +1091,7 @@ mod tests { #[test] fn test_from_str_invalid_value() { - let errval = Err(Error::from(Errno::EINVAL)); + let errval = Err(Errno::EINVAL); assert_eq!("NOSIGNAL".parse::<Signal>(), errval); assert_eq!("kill".parse::<Signal>(), errval); assert_eq!("9".parse::<Signal>(), errval); |