diff options
| author | bors <bors@rust-lang.org> | 2015-02-02 15:04:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-02-02 15:04:54 +0000 |
| commit | eaf4c5c784637f3df8bdebc6ec21dbd4bc69420a (patch) | |
| tree | b332bc283c06782c04fd27bf39cca386cb23c2c9 /src | |
| parent | 758a296e2710746a31b36a2396047aad2367cfa5 (diff) | |
| parent | 6a1a46e8d721fef8f31402e39c401646b1c35d6f (diff) | |
| download | rust-eaf4c5c784637f3df8bdebc6ec21dbd4bc69420a.tar.gz rust-eaf4c5c784637f3df8bdebc6ec21dbd4bc69420a.zip | |
Auto merge of #21864 - sanxiyn:no-chain, r=nikomatsakis
This avoids triggering #21694. It probably is a better way to do it anyway.
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustdoc/clean/mod.rs | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs index fe502922ffd..d5c03879438 100644 --- a/src/librustdoc/clean/mod.rs +++ b/src/librustdoc/clean/mod.rs @@ -355,21 +355,21 @@ impl Clean<Item> for doctree::Module { } else { "".to_string() }; - let items: Vec<Item> = - self.extern_crates.iter().map(|x| x.clean(cx)) - .chain(self.imports.iter().flat_map(|x| x.clean(cx).into_iter())) - .chain(self.structs.iter().map(|x| x.clean(cx))) - .chain(self.enums.iter().map(|x| x.clean(cx))) - .chain(self.fns.iter().map(|x| x.clean(cx))) - .chain(self.foreigns.iter().flat_map(|x| x.clean(cx).into_iter())) - .chain(self.mods.iter().map(|x| x.clean(cx))) - .chain(self.typedefs.iter().map(|x| x.clean(cx))) - .chain(self.statics.iter().map(|x| x.clean(cx))) - .chain(self.constants.iter().map(|x| x.clean(cx))) - .chain(self.traits.iter().map(|x| x.clean(cx))) - .chain(self.impls.iter().map(|x| x.clean(cx))) - .chain(self.macros.iter().map(|x| x.clean(cx))) - .collect(); + + 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.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.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().map(|x| x.clean(cx))); + items.extend(self.macros.iter().map(|x| x.clean(cx))); // determine if we should display the inner contents or // the outer `mod` item for the source code. |