diff options
Diffstat (limited to 'src/libstd/io/fs.rs')
| -rw-r--r-- | src/libstd/io/fs.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/io/fs.rs b/src/libstd/io/fs.rs index b7b7d1fb93d..f912b3ee38f 100644 --- a/src/libstd/io/fs.rs +++ b/src/libstd/io/fs.rs @@ -652,7 +652,7 @@ pub fn rmdir(path: &Path) -> IoResult<()> { /// at a non-directory file pub fn readdir(path: &Path) -> IoResult<Vec<Path>> { let err = LocalIo::maybe_raise(|io| { - Ok(try!(io.fs_readdir(&path.to_c_str(), 0)).move_iter().map(|a| { + Ok(try!(io.fs_readdir(&path.to_c_str(), 0)).into_iter().map(|a| { Path::new(a) }).collect()) }).map_err(IoError::from_rtio_error); @@ -764,7 +764,7 @@ pub fn rmdir_recursive(path: &Path) -> IoResult<()> { // delete all regular files in the way and push subdirs // on the stack - for child in children.move_iter() { + for child in children.into_iter() { // FIXME(#12795) we should use lstat in all cases let child_type = match cfg!(windows) { true => try!(update_err(stat(&child), path)), @@ -1059,11 +1059,11 @@ mod test { { let mut read_stream = File::open_mode(filename, Open, Read); { - let read_buf = read_mem.mut_slice(0, 4); + let read_buf = read_mem.slice_mut(0, 4); check!(read_stream.read(read_buf)); } { - let read_buf = read_mem.mut_slice(4, 8); + let read_buf = read_mem.slice_mut(4, 8); check!(read_stream.read(read_buf)); } } |