Merge #1113

1113: Libc enum tryfrom r=asomers a=asomers



Co-authored-by: Alan Somers <asomers@gmail.com>

2 files changed, 5 insertions, 2 deletions

diff --git a/test/sys/test_signal.rs b/test/sys/test_signal.rs
index 8780763f..11875750 100644
--- a/test/sys/test_signal.rs
+++ b/test/sys/test_signal.rs
@@ -2,6 +2,7 @@ use libc;
 use nix::Error;
 use nix::sys::signal::*;
 use nix::unistd::*;
+use std::convert::TryFrom;
 use std::sync::atomic::{AtomicBool, Ordering};
 
 #[test]
@@ -75,7 +76,7 @@ lazy_static! {
 }
 
 extern fn test_sigaction_handler(signal: libc::c_int) {
-    let signal = Signal::from_c_int(signal).unwrap();
+    let signal = Signal::try_from(signal).unwrap();
     SIGNALED.store(signal == Signal::SIGINT, Ordering::Relaxed);
 }
 
diff --git a/test/sys/test_signalfd.rs b/test/sys/test_signalfd.rs
index a3b60988..92759a48 100644
--- a/test/sys/test_signalfd.rs
+++ b/test/sys/test_signalfd.rs
@@ -1,3 +1,5 @@
+use std::convert::TryFrom;
+
 #[test]
 fn test_signalfd() {
     use nix::sys::signalfd::SignalFd;
@@ -20,6 +22,6 @@ fn test_signalfd() {
 
     // And now catch that same signal.
     let res = fd.read_signal().unwrap().unwrap();
-    let signo = Signal::from_c_int(res.ssi_signo as i32).unwrap();
+    let signo = Signal::try_from(res.ssi_signo as i32).unwrap();
     assert_eq!(signo, signal::SIGUSR1);
 }