Update to rust master

3 files changed, 6 insertions, 5 deletions

diff --git a/libssh2-sys/build.rs b/libssh2-sys/build.rs
index d6e18ec..b9881b0 100644
--- a/libssh2-sys/build.rs
+++ b/libssh2-sys/build.rs
@@ -1,4 +1,4 @@
-#![feature(path, fs_walk)]
+#![feature(fs_walk)]
 
 extern crate "pkg-config" as pkg_config;
 
@@ -95,8 +95,9 @@ fn main() {
             let file = file.unwrap().path();
             if fs::metadata(&file).map(|m| m.is_file()) != Ok(true) { continue }
 
-            let part = file.relative_from(&root).unwrap();
-            let dst = dst.join(part);
+            let mut root = root.iter();
+            let mut dst = dst.clone();
+            dst.extend(file.iter().skip_while(|c| Some(*c) == root.next()));
             fs::create_dir_all(dst.parent().unwrap()).unwrap();
             fs::copy(&file, &dst).unwrap();
         }
diff --git a/src/lib.rs b/src/lib.rs
index b3762da..ac43a47 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -124,7 +124,7 @@
 //! ```
 
 #![doc(html_root_url = "http://alexcrichton.com/ssh2-rs")]
-#![feature(unsafe_destructor, std_misc, collections, io, core, path, net)]
+#![feature(unsafe_destructor, std_misc, collections, io, core, net)]
 #![deny(missing_docs, unused_results)]
 #![cfg_attr(test, deny(warnings))]
 
diff --git a/tests/all.rs b/tests/all.rs
index ed900f0..1cde6e2 100644
--- a/tests/all.rs
+++ b/tests/all.rs
@@ -1,5 +1,5 @@
 #![deny(warnings)]
-#![feature(io, core, path, net)]
+#![feature(io, core, net)]
 
 extern crate ssh2;
 extern crate libc;