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/librustdoc/html | |
| parent | d8dfe1957b6541de8fe2797e248fe4bd2fac02d9 (diff) | |
| download | rust-fc525eeb4ec3443d29bce677f589b19f31c189bb.tar.gz rust-fc525eeb4ec3443d29bce677f589b19f31c189bb.zip | |
Fallout from renaming
Diffstat (limited to 'src/librustdoc/html')
| -rw-r--r-- | src/librustdoc/html/render.rs | 8 | ||||
| -rw-r--r-- | src/librustdoc/html/toc.rs | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs index 06346e0b6b9..169446b0ac0 100644 --- a/src/librustdoc/html/render.rs +++ b/src/librustdoc/html/render.rs @@ -299,7 +299,7 @@ pub fn run(mut krate: clean::Crate, external_html: &ExternalHtml, dst: Path) -> let paths: HashMap<ast::DefId, (Vec<String>, ItemType)> = analysis.as_ref().map(|a| { let paths = a.external_paths.borrow_mut().take().unwrap(); - paths.move_iter().map(|(k, (v, t))| { + paths.into_iter().map(|(k, (v, t))| { (k, (v, match t { clean::TypeStruct => item_type::Struct, clean::TypeEnum => item_type::Enum, @@ -950,7 +950,7 @@ impl DocFolder for Cache { use clean::{FixedVector, Slice, Tuple, PrimitiveTuple}; // extract relevant documentation for this impl - let dox = match attrs.move_iter().find(|a| { + let dox = match attrs.into_iter().find(|a| { match *a { clean::NameValue(ref x, _) if "doc" == x.as_slice() => { @@ -1207,7 +1207,7 @@ impl Context { _ => unreachable!() }; this.sidebar = build_sidebar(&m); - for item in m.items.move_iter() { + for item in m.items.into_iter() { f(this,item); } Ok(()) @@ -2143,7 +2143,7 @@ fn build_sidebar(m: &clean::Module) -> HashMap<String, Vec<String>> { v.push(myname); } - for (_, items) in map.mut_iter() { + for (_, items) in map.iter_mut() { items.as_mut_slice().sort(); } return map; diff --git a/src/librustdoc/html/toc.rs b/src/librustdoc/html/toc.rs index 45c75ccd1ab..4d2f23e1c31 100644 --- a/src/librustdoc/html/toc.rs +++ b/src/librustdoc/html/toc.rs @@ -167,7 +167,7 @@ impl TocBuilder { // get the thing we just pushed, so we can borrow the string // out of it with the right lifetime - let just_inserted = self.chain.mut_last().unwrap(); + let just_inserted = self.chain.last_mut().unwrap(); just_inserted.sec_number.as_slice() } } |
