mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #80802 - jyn514:box-attributes, r=nnethercote

Browse Source 
Box Item::Attributes

This reduces the size of Item from 128 to 40 bytes. I think this is as small as it needs to get 🎉

Builds on https://github.com/rust-lang/rust/pull/80339 and should not be merged before.

r? `@GuillaumeGomez`
This commit is contained in:
bors 2021-01-14 02:26:46 +00:00
commit c7b0ddbffe
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/librustdoc/clean/inline.rs
View File

@ -121,7 +121,7 @@
};
let target_attrs = load_attrs(cx, did);
let attrs = merge_attrs(cx, Some(parent_module), target_attrs, attrs_clone);
let attrs = box merge_attrs(cx, Some(parent_module), target_attrs, attrs_clone);
cx.renderinfo.borrow_mut().inlined.insert(did);
let what_rustc_thinks = clean::Item::from_def_id_and_parts(did, Some(name), kind, cx);
@ -446,7 +446,7 @@ fn merge_attrs(
}),
cx,
);
item.attrs = merge_attrs(cx, parent_module.into(), load_attrs(cx, did), attrs);
item.attrs = box merge_attrs(cx, parent_module.into(), load_attrs(cx, did), attrs);
debug!("merged_attrs={:?}", item.attrs);
ret.push(item);
}
@ -468,7 +468,7 @@ fn build_module(cx: &DocContext<'_>, did: DefId, visited: &mut FxHashSet<DefId>)
// Primitive types can't be inlined so generate an import instead.
items.push(clean::Item {
name: None,
attrs: clean::Attributes::default(),
attrs: box clean::Attributes::default(),
source: clean::Span::dummy(),
def_id: DefId::local(CRATE_DEF_INDEX),
visibility: clean::Public,

6
src/librustdoc/clean/mod.rs
View File

@ -2164,7 +2164,7 @@ fn clean_extern_crate(
// FIXME: using `from_def_id_and_kind` breaks `rustdoc/masked` for some reason
vec![Item {
name: None,
attrs: krate.attrs.clean(cx),
attrs: box krate.attrs.clean(cx),
source: krate.span.clean(cx),
def_id: crate_def_id,
visibility: krate.vis.clean(cx),
@ -2246,7 +2246,7 @@ fn clean(&self, cx: &DocContext<'_>) -> Vec<Item> {
) {
items.push(Item {
name: None,
attrs: self.attrs.clean(cx),
attrs: box self.attrs.clean(cx),
source: self.span.clean(cx),
def_id: cx.tcx.hir().local_def_id(self.id).to_def_id(),
visibility: self.vis.clean(cx),
@ -2264,7 +2264,7 @@ fn clean(&self, cx: &DocContext<'_>) -> Vec<Item> {
vec![Item {
name: None,
attrs: self.attrs.clean(cx),
attrs: box self.attrs.clean(cx),
source: self.span.clean(cx),
def_id: cx.tcx.hir().local_def_id(self.id).to_def_id(),
visibility: self.vis.clean(cx),

6
src/librustdoc/clean/types.rs
View File

@ -82,7 +82,7 @@
crate source: Span,
/// Not everything has a name. E.g., impls
crate name: Option<Symbol>,
crate attrs: Attributes,
crate attrs: Box<Attributes>,
crate visibility: Visibility,
crate kind: Box<ItemKind>,
crate def_id: DefId,
@ -90,7 +90,7 @@
// `Item` is used a lot. Make sure it doesn't unintentionally get bigger.
#[cfg(target_arch = "x86_64")]
rustc_data_structures::static_assert_size!(Item, 136);
rustc_data_structures::static_assert_size!(Item, 48);
impl fmt::Debug for Item {
fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
@ -159,7 +159,7 @@ pub fn from_def_id_and_parts(
kind: box kind,
name,
source: source.clean(cx),
attrs: cx.tcx.get_attrs(def_id).clean(cx),
attrs: box cx.tcx.get_attrs(def_id).clean(cx),
visibility: cx.tcx.visibility(def_id).clean(cx),
}
}