Skip to content

Commit fc08779

Browse files
committed
rustdoc: remove extraneous .move_iter().collect()s
The impl of Clean for Vec obsoleted these long, long ago.
1 parent 531a3c6 commit fc08779

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

src/librustdoc/clean/mod.rs

+24-24
Original file line numberDiff line numberDiff line change
@@ -347,18 +347,18 @@ impl Clean<Item> for doctree::Module {
347347
}
348348
}
349349
let items: Vec<Vec<Item> > = vec!(
350-
self.structs.clean().move_iter().collect(),
351-
self.enums.clean().move_iter().collect(),
352-
self.fns.clean().move_iter().collect(),
350+
self.structs.clean(),
351+
self.enums.clean(),
352+
self.fns.clean(),
353353
foreigns,
354-
self.mods.clean().move_iter().collect(),
355-
self.typedefs.clean().move_iter().collect(),
356-
self.statics.clean().move_iter().collect(),
357-
self.traits.clean().move_iter().collect(),
358-
self.impls.clean().move_iter().collect(),
354+
self.mods.clean(),
355+
self.typedefs.clean(),
356+
self.statics.clean(),
357+
self.traits.clean(),
358+
self.impls.clean(),
359359
self.view_items.clean().move_iter()
360360
.flat_map(|s| s.move_iter()).collect(),
361-
self.macros.clean().move_iter().collect()
361+
self.macros.clean(),
362362
);
363363

364364
// determine if we should display the inner contents or
@@ -406,7 +406,7 @@ impl Clean<Attribute> for ast::MetaItem {
406406
match self.node {
407407
ast::MetaWord(ref s) => Word(s.get().to_string()),
408408
ast::MetaList(ref s, ref l) => {
409-
List(s.get().to_string(), l.clean().move_iter().collect())
409+
List(s.get().to_string(), l.clean())
410410
}
411411
ast::MetaNameValue(ref s, ref v) => {
412412
NameValue(s.get().to_string(), lit_to_string(v))
@@ -460,7 +460,7 @@ impl Clean<TyParam> for ast::TyParam {
460460
TyParam {
461461
name: self.ident.clean(),
462462
did: ast::DefId { krate: ast::LOCAL_CRATE, node: self.id },
463-
bounds: self.bounds.clean().move_iter().collect(),
463+
bounds: self.bounds.clean(),
464464
default: self.default.clean()
465465
}
466466
}
@@ -688,7 +688,7 @@ impl Clean<Item> for ast::Method {
688688
};
689689
Item {
690690
name: Some(self.pe_ident().clean()),
691-
attrs: self.attrs.clean().move_iter().collect(),
691+
attrs: self.attrs.clean(),
692692
source: self.span.clean(),
693693
def_id: ast_util::local_def(self.id),
694694
visibility: self.pe_vis().clean(),
@@ -727,7 +727,7 @@ impl Clean<Item> for ast::TypeMethod {
727727
};
728728
Item {
729729
name: Some(self.ident.clean()),
730-
attrs: self.attrs.clean().move_iter().collect(),
730+
attrs: self.attrs.clean(),
731731
source: self.span.clean(),
732732
def_id: ast_util::local_def(self.id),
733733
visibility: None,
@@ -805,7 +805,7 @@ impl Clean<ClosureDecl> for ast::ClosureTy {
805805
onceness: self.onceness,
806806
fn_style: self.fn_style,
807807
bounds: match self.bounds {
808-
Some(ref x) => x.clean().move_iter().collect(),
808+
Some(ref x) => x.clean(),
809809
None => Vec::new()
810810
},
811811
}
@@ -1178,7 +1178,7 @@ impl Clean<Type> for ast::Ty {
11781178
TyTup(ref tys) => Tuple(tys.iter().map(|x| x.clean()).collect()),
11791179
TyPath(ref p, ref tpbs, id) => {
11801180
resolve_type(p.clean(),
1181-
tpbs.clean().map(|x| x.move_iter().collect()),
1181+
tpbs.clean().map(|x| x),
11821182
id)
11831183
}
11841184
TyClosure(ref c, region) => Closure(box c.clean(), region.clean()),
@@ -1307,7 +1307,7 @@ impl Clean<Item> for ast::StructField {
13071307
};
13081308
Item {
13091309
name: name.clean(),
1310-
attrs: self.node.attrs.clean().move_iter().collect(),
1310+
attrs: self.node.attrs.clean(),
13111311
source: self.span.clean(),
13121312
visibility: Some(vis),
13131313
stability: get_stability(ast_util::local_def(self.node.id)),
@@ -1398,7 +1398,7 @@ impl Clean<VariantStruct> for syntax::ast::StructDef {
13981398
fn clean(&self) -> VariantStruct {
13991399
VariantStruct {
14001400
struct_type: doctree::struct_type_from_def(self),
1401-
fields: self.fields.clean().move_iter().collect(),
1401+
fields: self.fields.clean(),
14021402
fields_stripped: false,
14031403
}
14041404
}
@@ -1566,7 +1566,7 @@ impl Clean<Path> for ast::Path {
15661566
fn clean(&self) -> Path {
15671567
Path {
15681568
global: self.global,
1569-
segments: self.segments.clean().move_iter().collect(),
1569+
segments: self.segments.clean(),
15701570
}
15711571
}
15721572
}
@@ -1582,8 +1582,8 @@ impl Clean<PathSegment> for ast::PathSegment {
15821582
fn clean(&self) -> PathSegment {
15831583
PathSegment {
15841584
name: self.identifier.clean(),
1585-
lifetimes: self.lifetimes.clean().move_iter().collect(),
1586-
types: self.types.clean().move_iter().collect()
1585+
lifetimes: self.lifetimes.clean(),
1586+
types: self.types.clean(),
15871587
}
15881588
}
15891589
}
@@ -1650,7 +1650,7 @@ impl Clean<BareFunctionDecl> for ast::BareFnTy {
16501650
BareFunctionDecl {
16511651
fn_style: self.fn_style,
16521652
generics: Generics {
1653-
lifetimes: self.lifetimes.clean().move_iter().collect(),
1653+
lifetimes: self.lifetimes.clean(),
16541654
type_params: Vec::new(),
16551655
},
16561656
decl: self.decl.clean(),
@@ -1755,7 +1755,7 @@ impl Clean<Vec<Item>> for ast::ViewItem {
17551755
let convert = |node: &ast::ViewItem_| {
17561756
Item {
17571757
name: None,
1758-
attrs: self.attrs.clean().move_iter().collect(),
1758+
attrs: self.attrs.clean(),
17591759
source: self.span.clean(),
17601760
def_id: ast_util::local_def(0),
17611761
visibility: self.vis.clean(),
@@ -1850,7 +1850,7 @@ impl Clean<ViewPath> for ast::ViewPath {
18501850
GlobImport(resolve_use_source(p.clean(), id)),
18511851
ast::ViewPathList(ref p, ref pl, id) => {
18521852
ImportList(resolve_use_source(p.clean(), id),
1853-
pl.clean().move_iter().collect())
1853+
pl.clean())
18541854
}
18551855
}
18561856
}
@@ -1903,7 +1903,7 @@ impl Clean<Item> for ast::ForeignItem {
19031903
};
19041904
Item {
19051905
name: Some(self.ident.clean()),
1906-
attrs: self.attrs.clean().move_iter().collect(),
1906+
attrs: self.attrs.clean(),
19071907
source: self.span.clean(),
19081908
def_id: ast_util::local_def(self.id),
19091909
visibility: self.vis.clean(),

0 commit comments

Comments
 (0)