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

Rollup merge of #100523 - GuillaumeGomez:remove-clean-impls, r=Dylan-DPC

Browse Source 
[rustdoc] remove Clean trait

Follow-up of https://github.com/rust-lang/rust/pull/99638.

This is (finally!) the last part.

r? `@Dylan-DPC`
This commit is contained in:
Matthias Krüger 2022-08-14 20:16:02 +02:00 committed by GitHub
commit 6519a03236
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,10 +44,6 @@ use utils::*;
pub(crate) use self::types::*; pub(crate) use self::types::*;
pub(crate) use self::utils::{get_auto_trait_and_blanket_impls, krate, register_res}; pub(crate) use self::utils::{get_auto_trait_and_blanket_impls, krate, register_res};
pub(crate) trait Clean<'tcx, T> {
fn clean(&self, cx: &mut DocContext<'tcx>) -> T;
}
pub(crate) fn clean_doc_module<'tcx>(doc: &DocModule<'tcx>, cx: &mut DocContext<'tcx>) -> Item { pub(crate) fn clean_doc_module<'tcx>(doc: &DocModule<'tcx>, cx: &mut DocContext<'tcx>) -> Item {
let mut items: Vec<Item> = vec![]; let mut items: Vec<Item> = vec![];
let mut inserted = FxHashSet::default(); let mut inserted = FxHashSet::default();
@ -1925,7 +1921,7 @@ fn clean_maybe_renamed_item<'tcx>(
})) }))
} }
ItemKind::Enum(ref def, generics) => EnumItem(Enum { ItemKind::Enum(ref def, generics) => EnumItem(Enum {
variants: def.variants.iter().map(|v| v.clean(cx)).collect(), variants: def.variants.iter().map(|v| clean_variant(v, cx)).collect(),
generics: clean_generics(generics, cx), generics: clean_generics(generics, cx),
}), }),
ItemKind::TraitAlias(generics, bounds) => TraitAliasItem(TraitAlias { ItemKind::TraitAlias(generics, bounds) => TraitAliasItem(TraitAlias {
@ -1978,14 +1974,12 @@ fn clean_maybe_renamed_item<'tcx>(
}) })
} }
impl<'tcx> Clean<'tcx, Item> for hir::Variant<'tcx> { fn clean_variant<'tcx>(variant: &hir::Variant<'tcx>, cx: &mut DocContext<'tcx>) -> Item {
fn clean(&self, cx: &mut DocContext<'tcx>) -> Item { let kind = VariantItem(clean_variant_data(&variant.data, cx));
let kind = VariantItem(clean_variant_data(&self.data, cx)); let what_rustc_thinks =
let what_rustc_thinks = Item::from_hir_id_and_parts(variant.id, Some(variant.ident.name), kind, cx);
Item::from_hir_id_and_parts(self.id, Some(self.ident.name), kind, cx); // don't show `pub` for variants, which are always public
// don't show `pub` for variants, which are always public Item { visibility: Inherited, ..what_rustc_thinks }
Item { visibility: Inherited, ..what_rustc_thinks }
}
} }
fn clean_impl<'tcx>( fn clean_impl<'tcx>(