bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #100138 - GuillaumeGomez:rm-clean-impls, r=notriddle

Browse source 
Remove more Clean trait implementations

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

r? `@notriddle`
This commit is contained in:
Matthias Krüger 2022-08-04 22:25:05 +02:00 • committed by GitHub
commit 60d83e732b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/librustdoc/clean/mod.rs
View file

@ -956,7 +956,11 @@ fn clean_fn_decl_with_args<'tcx>(
decl: &hir::FnDecl<'tcx>, decl: &hir::FnDecl<'tcx>,
args: Arguments, args: Arguments,
) -> FnDecl { ) -> FnDecl {
FnDecl { inputs: args, output: decl.output.clean(cx), c_variadic: decl.c_variadic } let output = match decl.output {
hir::FnRetTy::Return(typ) => Return(clean_ty(typ, cx)),
hir::FnRetTy::DefaultReturn(..) => DefaultReturn,
};
FnDecl { inputs: args, output, c_variadic: decl.c_variadic }
} }
fn clean_fn_decl_from_did_and_sig<'tcx>( fn clean_fn_decl_from_did_and_sig<'tcx>(
@ -991,27 +995,16 @@ fn clean_fn_decl_from_did_and_sig<'tcx>(
} }
} }
impl<'tcx> Clean<'tcx, FnRetTy> for hir::FnRetTy<'tcx> { fn clean_trait_ref<'tcx>(trait_ref: &hir::TraitRef<'tcx>, cx: &mut DocContext<'tcx>) -> Path {
fn clean(&self, cx: &mut DocContext<'tcx>) -> FnRetTy { let path = clean_path(trait_ref.path, cx);
match *self { register_res(cx, path.res);
Self::Return(typ) => Return(clean_ty(typ, cx)), path
Self::DefaultReturn(..) => DefaultReturn,
}
}
}
impl<'tcx> Clean<'tcx, Path> for hir::TraitRef<'tcx> {
fn clean(&self, cx: &mut DocContext<'tcx>) -> Path {
let path = clean_path(self.path, cx);
register_res(cx, path.res);
path
}
} }
impl<'tcx> Clean<'tcx, PolyTrait> for hir::PolyTraitRef<'tcx> { impl<'tcx> Clean<'tcx, PolyTrait> for hir::PolyTraitRef<'tcx> {
fn clean(&self, cx: &mut DocContext<'tcx>) -> PolyTrait { fn clean(&self, cx: &mut DocContext<'tcx>) -> PolyTrait {
PolyTrait { PolyTrait {
trait_: self.trait_ref.clean(cx), trait_: clean_trait_ref(&self.trait_ref, cx),
generic_params: self generic_params: self
.bound_generic_params .bound_generic_params
.iter() .iter()
@ -2000,7 +1993,7 @@ fn clean_impl<'tcx>(
) -> Vec<Item> { ) -> Vec<Item> {
let tcx = cx.tcx; let tcx = cx.tcx;
let mut ret = Vec::new(); let mut ret = Vec::new();
let trait_ = impl_.of_trait.as_ref().map(|t| t.clean(cx)); let trait_ = impl_.of_trait.as_ref().map(|t| clean_trait_ref(t, cx));
let items = let items =
impl_.items.iter().map(|ii| tcx.hir().impl_item(ii.id).clean(cx)).collect::<Vec<_>>(); impl_.items.iter().map(|ii| tcx.hir().impl_item(ii.id).clean(cx)).collect::<Vec<_>>();
let def_id = tcx.hir().local_def_id(hir_id); let def_id = tcx.hir().local_def_id(hir_id);