bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #21864 - sanxiyn:no-chain, r=nikomatsakis

Browse source 
This avoids triggering #21694. It probably is a better way to do it anyway.
This commit is contained in:
bors 2015-02-02 15:04:54 +00:00
commit eaf4c5c784
1 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/librustdoc/clean/mod.rs
View file

@ -355,21 +355,21 @@ impl Clean<Item> for doctree::Module {
} else { } else {
"".to_string() "".to_string()
}; };
let items: Vec<Item> =
self.extern_crates.iter().map(|x| x.clean(cx)) let mut items: Vec<Item> = vec![];
.chain(self.imports.iter().flat_map(|x| x.clean(cx).into_iter())) items.extend(self.extern_crates.iter().map(|x| x.clean(cx)));
.chain(self.structs.iter().map(|x| x.clean(cx))) items.extend(self.imports.iter().flat_map(|x| x.clean(cx).into_iter()));
.chain(self.enums.iter().map(|x| x.clean(cx))) items.extend(self.structs.iter().map(|x| x.clean(cx)));
.chain(self.fns.iter().map(|x| x.clean(cx))) items.extend(self.enums.iter().map(|x| x.clean(cx)));
.chain(self.foreigns.iter().flat_map(|x| x.clean(cx).into_iter())) items.extend(self.fns.iter().map(|x| x.clean(cx)));
.chain(self.mods.iter().map(|x| x.clean(cx))) items.extend(self.foreigns.iter().flat_map(|x| x.clean(cx).into_iter()));
.chain(self.typedefs.iter().map(|x| x.clean(cx))) items.extend(self.mods.iter().map(|x| x.clean(cx)));
.chain(self.statics.iter().map(|x| x.clean(cx))) items.extend(self.typedefs.iter().map(|x| x.clean(cx)));
.chain(self.constants.iter().map(|x| x.clean(cx))) items.extend(self.statics.iter().map(|x| x.clean(cx)));
.chain(self.traits.iter().map(|x| x.clean(cx))) items.extend(self.constants.iter().map(|x| x.clean(cx)));
.chain(self.impls.iter().map(|x| x.clean(cx))) items.extend(self.traits.iter().map(|x| x.clean(cx)));
.chain(self.macros.iter().map(|x| x.clean(cx))) items.extend(self.impls.iter().map(|x| x.clean(cx)));
.collect(); items.extend(self.macros.iter().map(|x| x.clean(cx)));
// determine if we should display the inner contents or // determine if we should display the inner contents or
// the outer `mod` item for the source code. // the outer `mod` item for the source code.