diff options
| author | Aaron Turon <aturon@mozilla.com> | 2014-09-14 20:27:36 -0700 |
|---|---|---|
| committer | Aaron Turon <aturon@mozilla.com> | 2014-09-16 14:37:48 -0700 |
| commit | fc525eeb4ec3443d29bce677f589b19f31c189bb (patch) | |
| tree | d807bad5c91171751157a945dde963dcfd4ea95e /src/libglob | |
| parent | d8dfe1957b6541de8fe2797e248fe4bd2fac02d9 (diff) | |
Fallout from renaming
Diffstat (limited to 'src/libglob')
| -rw-r--r-- | src/libglob/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libglob/lib.rs b/src/libglob/lib.rs index 0cc9bb1a8aa..337919b5c68 100644 --- a/src/libglob/lib.rs +++ b/src/libglob/lib.rs @@ -190,7 +190,7 @@ fn list_dir_sorted(path: &Path) -> Option<Vec<Path>> { match fs::readdir(path) { Ok(mut children) => { children.sort_by(|p1, p2| p2.filename().cmp(&p1.filename())); - Some(children.move_iter().collect()) + Some(children.into_iter().collect()) } Err(..) => None } @@ -505,7 +505,7 @@ fn fill_todo(todo: &mut Vec<(Path, uint)>, patterns: &[Pattern], idx: uint, path None => { match list_dir_sorted(path) { Some(entries) => { - todo.extend(entries.move_iter().map(|x|(x, idx))); + todo.extend(entries.into_iter().map(|x|(x, idx))); // Matching the special directory entries . and .. that refer to // the current and parent directory respectively requires that |
