diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-08-14 20:16:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-14 20:16:02 +0200 |
| commit | 6519a03236df6f20dc2aad89fd3585bc5e351bb5 (patch) | |
| tree | c6f88fa3cad122a1bcf6efe92edec6fd5b23d2a6 | |
| parent | 6e53472ffcf57e9721efc24b69124c5e1f882f5a (diff) | |
| parent | 74fb5f85b3c7fd5023a7ca0190542a18fc16fafa (diff) | |
| download | rust-6519a03236df6f20dc2aad89fd3585bc5e351bb5.tar.gz rust-6519a03236df6f20dc2aad89fd3585bc5e351bb5.zip | |
Rollup merge of #100523 - GuillaumeGomez:remove-clean-impls, r=Dylan-DPC
[rustdoc] remove Clean trait Follow-up of https://github.com/rust-lang/rust/pull/99638. This is (finally!) the last part. r? `@Dylan-DPC`
| -rw-r--r-- | src/librustdoc/clean/mod.rs | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs index addd6ffa11e..971617a8400 100644 --- a/src/librustdoc/clean/mod.rs +++ b/src/librustdoc/clean/mod.rs @@ -44,10 +44,6 @@ use utils::*; pub(crate) use self::types::*; 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 { let mut items: Vec<Item> = vec![]; let mut inserted = FxHashSet::default(); @@ -1925,7 +1921,7 @@ fn clean_maybe_renamed_item<'tcx>( })) } 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), }), 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(&self, cx: &mut DocContext<'tcx>) -> Item { - let kind = VariantItem(clean_variant_data(&self.data, cx)); - let what_rustc_thinks = - Item::from_hir_id_and_parts(self.id, Some(self.ident.name), kind, cx); - // don't show `pub` for variants, which are always public - Item { visibility: Inherited, ..what_rustc_thinks } - } +fn clean_variant<'tcx>(variant: &hir::Variant<'tcx>, cx: &mut DocContext<'tcx>) -> Item { + let kind = VariantItem(clean_variant_data(&variant.data, cx)); + let what_rustc_thinks = + Item::from_hir_id_and_parts(variant.id, Some(variant.ident.name), kind, cx); + // don't show `pub` for variants, which are always public + Item { visibility: Inherited, ..what_rustc_thinks } } fn clean_impl<'tcx>( |
