diff options
author | Alex Crichton <alex@alexcrichton.com> | 2015-03-25 09:44:24 -0700 |
---|---|---|
committer | Alex Crichton <alex@alexcrichton.com> | 2015-03-25 09:44:24 -0700 |
commit | b41fbc927ff55525fc4a6c31aea83e49604f84bc (patch) | |
tree | dd6600c32c73786e5ec9f9ab7efa405622765cd6 /src | |
parent | 20051a11312ff1769bd21c461232c0cb8bc99815 (diff) | |
download | ssh2-rs-b41fbc927ff55525fc4a6c31aea83e49604f84bc.zip |
Update to rust master
Diffstat (limited to 'src')
-rw-r--r-- | src/lib.rs | 2 | ||||
-rw-r--r-- | src/sftp.rs | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -124,7 +124,7 @@ //! ``` #![doc(html_root_url = "http://alexcrichton.com/ssh2-rs")] -#![feature(unsafe_destructor, std_misc, collections, io, core, io_ext)] +#![feature(unsafe_destructor, std_misc, collections, io, io_ext, convert)] #![deny(missing_docs, unused_results)] #![cfg_attr(test, deny(warnings))] diff --git a/src/sftp.rs b/src/sftp.rs index d4f4a0c..d4646dc 100644 --- a/src/sftp.rs +++ b/src/sftp.rs @@ -555,10 +555,10 @@ impl FileStat { fn mkpath(v: Vec<u8>) -> PathBuf { use std::os::unix::prelude::*; use std::ffi::OsStr; - PathBuf::new(<OsStr as OsStrExt>::from_bytes(&v)) + PathBuf::from(OsStr::from_bytes(&v)) } #[cfg(windows)] fn mkpath(v: Vec<u8>) -> PathBuf { use std::str; - PathBuf::new(str::from_utf8(&v).unwrap()) + PathBuf::from(str::from_utf8(&v).unwrap()) } |