summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Lerche <me@carllerche.com>2015-03-10 11:49:58 -0700
committerCarl Lerche <me@carllerche.com>2015-03-10 11:49:58 -0700
commit67d6580d2c41c584d375ca57a67405fe8f5b4339 (patch)
tree1a0a086f299f0ab08aa82d58a2e418f69dbd8d95
parent5d7f9c618655472654b79eeb22a9d13ec89035e7 (diff)
downloadnix-67d6580d2c41c584d375ca57a67405fe8f5b4339.zip
Track Rust nightlies
-rw-r--r--nix-test/build.rs2
-rw-r--r--nix-test/src/lib.rs2
-rw-r--r--src/sys/socket/addr.rs2
3 files changed, 2 insertions, 4 deletions
diff --git a/nix-test/build.rs b/nix-test/build.rs
index cb9cae9b..b9421014 100644
--- a/nix-test/build.rs
+++ b/nix-test/build.rs
@@ -1,5 +1,3 @@
-#![feature(env, process)]
-
use std::env;
use std::process::Command;
diff --git a/nix-test/src/lib.rs b/nix-test/src/lib.rs
index 26d7cd4d..97d6825c 100644
--- a/nix-test/src/lib.rs
+++ b/nix-test/src/lib.rs
@@ -1,4 +1,4 @@
-#![feature(libc, std_misc)]
+#![feature(libc)]
extern crate libc;
diff --git a/src/sys/socket/addr.rs b/src/sys/socket/addr.rs
index 2ebb5d88..26d6349e 100644
--- a/src/sys/socket/addr.rs
+++ b/src/sys/socket/addr.rs
@@ -329,7 +329,7 @@ impl UnixAddr {
return Err(NixError::Sys(Errno::ENAMETOOLONG));
}
- ptr::copy_memory(
+ ptr::copy(
ret.sun_path.as_mut_ptr(),
bytes.as_ptr() as *const i8,
bytes.len());