Skip to content

Commit eaf4c5c

Browse files
committed
Auto merge of #21864 - sanxiyn:no-chain, r=nikomatsakis
This avoids triggering #21694. It probably is a better way to do it anyway.
2 parents 758a296 + 6a1a46e commit eaf4c5c

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

src/librustdoc/clean/mod.rs

+15-15
Original file line numberDiff line numberDiff line change
@@ -355,21 +355,21 @@ impl Clean<Item> for doctree::Module {
355355
} else {
356356
"".to_string()
357357
};
358-
let items: Vec<Item> =
359-
self.extern_crates.iter().map(|x| x.clean(cx))
360-
.chain(self.imports.iter().flat_map(|x| x.clean(cx).into_iter()))
361-
.chain(self.structs.iter().map(|x| x.clean(cx)))
362-
.chain(self.enums.iter().map(|x| x.clean(cx)))
363-
.chain(self.fns.iter().map(|x| x.clean(cx)))
364-
.chain(self.foreigns.iter().flat_map(|x| x.clean(cx).into_iter()))
365-
.chain(self.mods.iter().map(|x| x.clean(cx)))
366-
.chain(self.typedefs.iter().map(|x| x.clean(cx)))
367-
.chain(self.statics.iter().map(|x| x.clean(cx)))
368-
.chain(self.constants.iter().map(|x| x.clean(cx)))
369-
.chain(self.traits.iter().map(|x| x.clean(cx)))
370-
.chain(self.impls.iter().map(|x| x.clean(cx)))
371-
.chain(self.macros.iter().map(|x| x.clean(cx)))
372-
.collect();
358+
359+
let mut items: Vec<Item> = vec![];
360+
items.extend(self.extern_crates.iter().map(|x| x.clean(cx)));
361+
items.extend(self.imports.iter().flat_map(|x| x.clean(cx).into_iter()));
362+
items.extend(self.structs.iter().map(|x| x.clean(cx)));
363+
items.extend(self.enums.iter().map(|x| x.clean(cx)));
364+
items.extend(self.fns.iter().map(|x| x.clean(cx)));
365+
items.extend(self.foreigns.iter().flat_map(|x| x.clean(cx).into_iter()));
366+
items.extend(self.mods.iter().map(|x| x.clean(cx)));
367+
items.extend(self.typedefs.iter().map(|x| x.clean(cx)));
368+
items.extend(self.statics.iter().map(|x| x.clean(cx)));
369+
items.extend(self.constants.iter().map(|x| x.clean(cx)));
370+
items.extend(self.traits.iter().map(|x| x.clean(cx)));
371+
items.extend(self.impls.iter().map(|x| x.clean(cx)));
372+
items.extend(self.macros.iter().map(|x| x.clean(cx)));
373373

374374
// determine if we should display the inner contents or
375375
// the outer `mod` item for the source code.

0 commit comments

Comments
 (0)