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

remove Clean trait implementation for hir::TraitItem

Browse Source
This commit is contained in:
Guillaume Gomez 2022-08-05 12:08:32 +02:00
parent 38083acde2
commit 46d17d6aaa
1 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1016,55 +1016,53 @@ fn clean_poly_trait_ref<'tcx>(
} }
} }
impl<'tcx> Clean<'tcx, Item> for hir::TraitItem<'tcx> { fn clean_trait_item<'tcx>(trait_item: &hir::TraitItem<'tcx>, cx: &mut DocContext<'tcx>) -> Item {
fn clean(&self, cx: &mut DocContext<'tcx>) -> Item { let local_did = trait_item.def_id.to_def_id();
let local_did = self.def_id.to_def_id(); cx.with_param_env(local_did, |cx| {
cx.with_param_env(local_did, |cx| { let inner = match trait_item.kind {
let inner = match self.kind { hir::TraitItemKind::Const(ty, Some(default)) => AssocConstItem(
hir::TraitItemKind::Const(ty, Some(default)) => AssocConstItem( clean_ty(ty, cx),
clean_ty(ty, cx), ConstantKind::Local { def_id: local_did, body: default },
ConstantKind::Local { def_id: local_did, body: default }, ),
), hir::TraitItemKind::Const(ty, None) => TyAssocConstItem(clean_ty(ty, cx)),
hir::TraitItemKind::Const(ty, None) => TyAssocConstItem(clean_ty(ty, cx)), hir::TraitItemKind::Fn(ref sig, hir::TraitFn::Provided(body)) => {
hir::TraitItemKind::Fn(ref sig, hir::TraitFn::Provided(body)) => { let m = clean_function(cx, sig, trait_item.generics, body);
let m = clean_function(cx, sig, self.generics, body); MethodItem(m, None)
MethodItem(m, None) }
} hir::TraitItemKind::Fn(ref sig, hir::TraitFn::Required(names)) => {
hir::TraitItemKind::Fn(ref sig, hir::TraitFn::Required(names)) => { let (generics, decl) = enter_impl_trait(cx, |cx| {
let (generics, decl) = enter_impl_trait(cx, |cx| { // NOTE: generics must be cleaned before args
// NOTE: generics must be cleaned before args let generics = trait_item.generics.clean(cx);
let generics = self.generics.clean(cx); let args = clean_args_from_types_and_names(cx, sig.decl.inputs, names);
let args = clean_args_from_types_and_names(cx, sig.decl.inputs, names); let decl = clean_fn_decl_with_args(cx, sig.decl, args);
let decl = clean_fn_decl_with_args(cx, sig.decl, args); (generics, decl)
(generics, decl) });
}); TyMethodItem(Box::new(Function { decl, generics }))
TyMethodItem(Box::new(Function { decl, generics })) }
} hir::TraitItemKind::Type(bounds, Some(default)) => {
hir::TraitItemKind::Type(bounds, Some(default)) => { let generics = enter_impl_trait(cx, |cx| trait_item.generics.clean(cx));
let generics = enter_impl_trait(cx, |cx| self.generics.clean(cx)); let bounds = bounds.iter().filter_map(|x| x.clean(cx)).collect();
let bounds = bounds.iter().filter_map(|x| x.clean(cx)).collect(); let item_type = clean_middle_ty(hir_ty_to_ty(cx.tcx, default), cx, None);
let item_type = clean_middle_ty(hir_ty_to_ty(cx.tcx, default), cx, None); AssocTypeItem(
AssocTypeItem( Box::new(Typedef {
Box::new(Typedef { type_: clean_ty(default, cx),
type_: clean_ty(default, cx), generics,
generics, item_type: Some(item_type),
item_type: Some(item_type), }),
}), bounds,
bounds, )
) }
} hir::TraitItemKind::Type(bounds, None) => {
hir::TraitItemKind::Type(bounds, None) => { let generics = enter_impl_trait(cx, |cx| trait_item.generics.clean(cx));
let generics = enter_impl_trait(cx, |cx| self.generics.clean(cx)); let bounds = bounds.iter().filter_map(|x| x.clean(cx)).collect();
let bounds = bounds.iter().filter_map(|x| x.clean(cx)).collect(); TyAssocTypeItem(Box::new(generics), bounds)
TyAssocTypeItem(Box::new(generics), bounds) }
} };
}; let what_rustc_thinks =
let what_rustc_thinks = Item::from_def_id_and_parts(local_did, Some(trait_item.ident.name), inner, cx);
Item::from_def_id_and_parts(local_did, Some(self.ident.name), inner, cx); // Trait items always inherit the trait's visibility -- we don't want to show `pub`.
// Trait items always inherit the trait's visibility -- we don't want to show `pub`. Item { visibility: Inherited, ..what_rustc_thinks }
Item { visibility: Inherited, ..what_rustc_thinks } })
})
}
} }
impl<'tcx> Clean<'tcx, Item> for hir::ImplItem<'tcx> { impl<'tcx> Clean<'tcx, Item> for hir::ImplItem<'tcx> {
@ -1954,8 +1952,10 @@ fn clean_maybe_renamed_item<'tcx>(
}) })
} }
ItemKind::Trait(_, _, generics, bounds, item_ids) => { ItemKind::Trait(_, _, generics, bounds, item_ids) => {
let items = let items = item_ids
item_ids.iter().map(|ti| cx.tcx.hir().trait_item(ti.id).clean(cx)).collect(); .iter()
.map(|ti| clean_trait_item(cx.tcx.hir().trait_item(ti.id), cx))
.collect();
TraitItem(Trait { TraitItem(Trait {
def_id, def_id,