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/libstd/path | |
| parent | d8dfe1957b6541de8fe2797e248fe4bd2fac02d9 (diff) | |
| download | rust-fc525eeb4ec3443d29bce677f589b19f31c189bb.tar.gz rust-fc525eeb4ec3443d29bce677f589b19f31c189bb.zip | |
Fallout from renaming
Diffstat (limited to 'src/libstd/path')
| -rw-r--r-- | src/libstd/path/posix.rs | 4 | ||||
| -rw-r--r-- | src/libstd/path/windows.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/path/posix.rs b/src/libstd/path/posix.rs index 06eab31d7bf..c654d3a668a 100644 --- a/src/libstd/path/posix.rs +++ b/src/libstd/path/posix.rs @@ -382,7 +382,7 @@ impl Path { let n = if is_abs { comps.len() } else { comps.len() - 1} + comps.iter().map(|v| v.len()).sum(); let mut v = Vec::with_capacity(n); - let mut it = comps.move_iter(); + let mut it = comps.into_iter(); if !is_abs { match it.next() { None => (), @@ -1201,7 +1201,7 @@ mod tests { assert!(comps == exps, "components: Expected {:?}, found {:?}", comps, exps); let comps = path.components().rev().collect::<Vec<&[u8]>>(); - let exps = exps.move_iter().rev().collect::<Vec<&[u8]>>(); + let exps = exps.into_iter().rev().collect::<Vec<&[u8]>>(); assert!(comps == exps, "rev_components: Expected {:?}, found {:?}", comps, exps); } diff --git a/src/libstd/path/windows.rs b/src/libstd/path/windows.rs index d9864cfaa61..e68c8bdb07d 100644 --- a/src/libstd/path/windows.rs +++ b/src/libstd/path/windows.rs @@ -832,7 +832,7 @@ impl Path { Some(_) => s.push_str(prefix_), None => () } - let mut it = comps.move_iter(); + let mut it = comps.into_iter(); if !is_abs { match it.next() { None => (), |