diff options
Diffstat (limited to 'src/librustdoc/clean')
| -rw-r--r-- | src/librustdoc/clean/inline.rs | 10 | ||||
| -rw-r--r-- | src/librustdoc/clean/mod.rs | 12 | ||||
| -rw-r--r-- | src/librustdoc/clean/simplify.rs | 4 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/librustdoc/clean/inline.rs b/src/librustdoc/clean/inline.rs index cd8d7b416d2..aa364c4c746 100644 --- a/src/librustdoc/clean/inline.rs +++ b/src/librustdoc/clean/inline.rs @@ -83,17 +83,17 @@ fn try_inline_def(cx: &DocContext, tcx: &ty::ctxt, } def::DefStruct(did) => { record_extern_fqn(cx, did, clean::TypeStruct); - ret.extend(build_impls(cx, tcx, did).into_iter()); + ret.extend(build_impls(cx, tcx, did)); clean::StructItem(build_struct(cx, tcx, did)) } def::DefTy(did, false) => { record_extern_fqn(cx, did, clean::TypeTypedef); - ret.extend(build_impls(cx, tcx, did).into_iter()); + ret.extend(build_impls(cx, tcx, did)); build_type(cx, tcx, did) } def::DefTy(did, true) => { record_extern_fqn(cx, did, clean::TypeEnum); - ret.extend(build_impls(cx, tcx, did).into_iter()); + ret.extend(build_impls(cx, tcx, did)); build_type(cx, tcx, did) } // Assume that the enum type is reexported next to the variant, and @@ -228,7 +228,7 @@ pub fn build_impls(cx: &DocContext, tcx: &ty::ctxt, match tcx.inherent_impls.borrow().get(&did) { None => {} Some(i) => { - for &did in i.iter() { + for &did in &**i { build_impl(cx, tcx, did, &mut impls); } } @@ -451,7 +451,7 @@ fn build_module(cx: &DocContext, tcx: &ty::ctxt, decoder::DlDef(def) if vis == ast::Public => { if !visited.insert(def) { return } match try_inline_def(cx, tcx, def) { - Some(i) => items.extend(i.into_iter()), + Some(i) => items.extend(i), None => {} } } diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs index af0c3a1c02a..bbd999b1d73 100644 --- a/src/librustdoc/clean/mod.rs +++ b/src/librustdoc/clean/mod.rs @@ -190,7 +190,7 @@ impl<'a, 'tcx> Clean<Crate> for visit_ast::RustdocVisitor<'a, 'tcx> { inner: PrimitiveItem(prim), }); } - m.items.extend(tmp.into_iter()); + m.items.extend(tmp); } let src = match cx.input { @@ -382,17 +382,17 @@ impl Clean<Item> for doctree::Module { let mut items: Vec<Item> = vec![]; items.extend(self.extern_crates.iter().map(|x| x.clean(cx))); - items.extend(self.imports.iter().flat_map(|x| x.clean(cx).into_iter())); + items.extend(self.imports.iter().flat_map(|x| x.clean(cx))); items.extend(self.structs.iter().map(|x| x.clean(cx))); items.extend(self.enums.iter().map(|x| x.clean(cx))); items.extend(self.fns.iter().map(|x| x.clean(cx))); - items.extend(self.foreigns.iter().flat_map(|x| x.clean(cx).into_iter())); + items.extend(self.foreigns.iter().flat_map(|x| x.clean(cx))); items.extend(self.mods.iter().map(|x| x.clean(cx))); items.extend(self.typedefs.iter().map(|x| x.clean(cx))); items.extend(self.statics.iter().map(|x| x.clean(cx))); items.extend(self.constants.iter().map(|x| x.clean(cx))); items.extend(self.traits.iter().map(|x| x.clean(cx))); - items.extend(self.impls.iter().flat_map(|x| x.clean(cx).into_iter())); + items.extend(self.impls.iter().flat_map(|x| x.clean(cx))); items.extend(self.macros.iter().map(|x| x.clean(cx))); items.extend(self.def_traits.iter().map(|x| x.clean(cx))); @@ -1884,7 +1884,7 @@ impl<'tcx> Clean<Item> for ty::VariantInfo<'tcx> { StructVariant(VariantStruct { struct_type: doctree::Plain, fields_stripped: false, - fields: s.iter().zip(self.args.iter()).map(|(name, ty)| { + fields: s.iter().zip(&self.args).map(|(name, ty)| { Item { source: Span::empty(), name: Some(name.clean(cx)), @@ -2375,7 +2375,7 @@ impl Clean<Vec<Item>> for doctree::Import { for path in list { match inline::try_inline(cx, path.node.id(), None) { Some(items) => { - ret.extend(items.into_iter()); + ret.extend(items); } None => { remaining.push(path.clean(cx)); diff --git a/src/librustdoc/clean/simplify.rs b/src/librustdoc/clean/simplify.rs index 03f056a6923..2bde8d5bfb5 100644 --- a/src/librustdoc/clean/simplify.rs +++ b/src/librustdoc/clean/simplify.rs @@ -139,7 +139,7 @@ pub fn where_clauses(cx: &DocContext, clauses: Vec<WP>) -> Vec<WP> { } pub fn ty_params(mut params: Vec<clean::TyParam>) -> Vec<clean::TyParam> { - for param in params.iter_mut() { + for param in &mut params { param.bounds = ty_bounds(mem::replace(&mut param.bounds, Vec::new())); } return params; @@ -165,7 +165,7 @@ fn trait_is_same_or_supertrait(cx: &DocContext, child: ast::DefId, } if *s == "Self" => Some(bounds), _ => None, } - }).flat_map(|bounds| bounds.iter()).any(|bound| { + }).flat_map(|bounds| bounds).any(|bound| { let poly_trait = match *bound { clean::TraitBound(ref t, _) => t, _ => return false, |
