diff options
author | Carl Lerche <me@carllerche.com> | 2015-02-20 16:17:59 -0800 |
---|---|---|
committer | Carl Lerche <me@carllerche.com> | 2015-02-20 16:17:59 -0800 |
commit | 95a8fb8099524d1d2850a5f6c2e6d12b4eb49a5b (patch) | |
tree | fcc576b525c2e1d8a9cd3d8d5a0e24c91b2c3d76 | |
parent | 844c8903194b40dc973ed95af71943479af1dddd (diff) | |
download | nix-95a8fb8099524d1d2850a5f6c2e6d12b4eb49a5b.zip |
Fix more deprecations
-rw-r--r-- | nix-test/src/lib.rs | 2 | ||||
-rw-r--r-- | tests/unistd.rs | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/nix-test/src/lib.rs b/nix-test/src/lib.rs index a8be2feb..6cd3a1f4 100644 --- a/nix-test/src/lib.rs +++ b/nix-test/src/lib.rs @@ -16,7 +16,7 @@ mod ffi { pub fn assert_errno_eq(err: &str, val: c_int) { unsafe { - let name = CString::from_slice(err.as_bytes()); + let name = CString::new(err).unwrap(); let actual = ffi::assert_errno_eq(name.as_ptr()); assert!(actual > 0); diff --git a/tests/unistd.rs b/tests/unistd.rs index ee7de170..7a5d34e1 100644 --- a/tests/unistd.rs +++ b/tests/unistd.rs @@ -144,12 +144,12 @@ mod test { // Make `writer` be the stdout of the new process. dup(writer).unwrap(); // exec! - execve(&CString::from_slice(b"/bin/sh"), - &[CString::from_slice(b""), - CString::from_slice(b"-c"), - CString::from_slice(b"echo nix!!! && env")], - &[CString::from_slice(b"foo=bar"), - CString::from_slice(b"baz=quux")]).unwrap(); + execve(&CString::new(b"/bin/sh").unwrap(), + &[CString::new(b"").unwrap(), + CString::new(b"-c").unwrap(), + CString::new(b"echo nix!!! && env").unwrap()], + &[CString::new(b"foo=bar").unwrap(), + CString::new(b"baz=quux").unwrap()]).unwrap(); }, Parent(child_pid) => { // Wait for the child to exit. |