Skip to content

Commit

Permalink
Auto merge of rust-lang#82265 - GuillaumeGomez:cleanup-attrs-twice, r…
Browse files Browse the repository at this point in the history
…=jyn514

Prevent to compute Item attributes twice

I came across this case when working on another part of rustdoc. Not a game changer but a nice little improvement.

cc `@camelid`

r? `@jyn514`
  • Loading branch information
bors committed Feb 25, 2021
2 parents 89d32eb + cc0d531 commit b36f770
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 6 deletions.
11 changes: 6 additions & 5 deletions src/librustdoc/clean/inline.rs
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,10 @@ crate fn build_impl(

debug!("build_impl: impl {:?} for {:?}", trait_.def_id(), for_.def_id());

let mut item = clean::Item::from_def_id_and_parts(
let attrs = box merge_attrs(cx, parent_module.into(), load_attrs(cx, did), attrs);
debug!("merged_attrs={:?}", attrs);

ret.push(clean::Item::from_def_id_and_attrs_and_parts(
did,
None,
clean::ImplItem(clean::Impl {
Expand All @@ -428,11 +431,9 @@ crate fn build_impl(
synthetic: false,
blanket_impl: None,
}),
attrs,
cx,
);
item.attrs = box merge_attrs(cx, parent_module.into(), load_attrs(cx, did), attrs);
debug!("merged_attrs={:?}", item.attrs);
ret.push(item);
));
}

fn build_module(
Expand Down
18 changes: 17 additions & 1 deletion src/librustdoc/clean/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,22 @@ impl Item {
name: Option<Symbol>,
kind: ItemKind,
cx: &mut DocContext<'_>,
) -> Item {
Self::from_def_id_and_attrs_and_parts(
def_id,
name,
kind,
box cx.tcx.get_attrs(def_id).clean(cx),
cx,
)
}

pub fn from_def_id_and_attrs_and_parts(
def_id: DefId,
name: Option<Symbol>,
kind: ItemKind,
attrs: Box<Attributes>,
cx: &mut DocContext<'_>,
) -> Item {
debug!("name={:?}, def_id={:?}", name, def_id);

Expand All @@ -164,7 +180,7 @@ impl Item {
kind: box kind,
name,
source: source.clean(cx),
attrs: box cx.tcx.get_attrs(def_id).clean(cx),
attrs,
visibility: cx.tcx.visibility(def_id).clean(cx),
}
}
Expand Down

0 comments on commit b36f770

Please sign in to comment.