squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Calculate more correct capacity in merge_attrs

Browse source 
Co-authored-by: jyn514 <joshua@yottadb.com>
This commit is contained in:
Lzu Tao 2020-09-18 01:55:40 +00:00
parent f4e4485a05
commit 2818032a2d
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/librustdoc/clean/inline.rs
View file

@ -306,15 +306,17 @@ fn merge_attrs(
attrs: Attrs<'_>,
other_attrs: Option<Attrs<'_>>,
) -> clean::Attributes {
let mut merged_attrs: Vec<ast::Attribute> = Vec::with_capacity(attrs.len());
// If we have additional attributes (from a re-export),
// NOTE: If we have additional attributes (from a re-export),
// always insert them first. This ensure that re-export
// doc comments show up before the original doc comments
// when we render them.
if let Some(a) = other_attrs {
merged_attrs.extend(a.iter().cloned());
}
merged_attrs.extend(attrs.to_vec());
let merged_attrs = if let Some(inner) = other_attrs {
let mut both = inner.to_vec();
both.extend_from_slice(attrs);
both
} else {
attrs.to_vec()
};
merged_attrs.clean(cx)
}