NixResult -> nix::Result; NixError -> nix::Error

2 files changed, 4 insertions, 4 deletions

diff --git a/test/sys/test_socket.rs b/test/sys/test_socket.rs
index d175b693..97ee889d 100644
--- a/test/sys/test_socket.rs
+++ b/test/sys/test_socket.rs
@@ -30,7 +30,7 @@ pub fn test_path_to_sock_addr() {
     let actual = Path::new("/foo/bar");
     let addr = UnixAddr::new(actual).unwrap();
 
-    let expect: &'static [i8] = unsafe { mem::transmute(b"/foo/bar") };
+    let expect: &'static [i8] = unsafe { mem::transmute(b"/foo/bar".as_slice()) };
     assert_eq!(&addr.0.sun_path[..8], expect);
 
     assert_eq!(addr.path(), actual);
diff --git a/test/sys/test_termios.rs b/test/sys/test_termios.rs
index 24ce3434..fd6dbcd6 100644
--- a/test/sys/test_termios.rs
+++ b/test/sys/test_termios.rs
@@ -1,6 +1,6 @@
 use nix::errno::Errno;
 use nix::sys::termios;
-use nix::{NixError, unistd};
+use nix::{Error, unistd};
 
 #[test]
 fn test_tcgetattr() {
@@ -11,8 +11,8 @@ fn test_tcgetattr() {
             Ok(true) => assert!(termios.is_ok()),
             // If it's an invalid file descriptor, tcgetattr should also return
             // the same error
-            Err(NixError::Sys(Errno::EBADF)) => {
-                assert!(termios.err() == Some(NixError::Sys(Errno::EBADF)));
+            Err(Error::Sys(Errno::EBADF)) => {
+                assert!(termios.err() == Some(Error::Sys(Errno::EBADF)));
             },
             // Otherwise it should return any error
             _ => assert!(termios.is_err())