bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Don't use is_local to determine function cleaning method call intent

Browse source
This commit is contained in:
Rune Tynan 2022-01-26 19:51:32 -05:00
parent 6abb6385b2
commit 2f7b7d5f4a
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/librustdoc/clean/inline.rs
View file

@ -228,7 +228,7 @@ fn build_external_function(cx: &mut DocContext<'_>, did: DefId) -> clean::Functi
let (generics, decl) = clean::enter_impl_trait(cx, |cx| { let (generics, decl) = clean::enter_impl_trait(cx, |cx| {
// NOTE: generics need to be cleaned before the decl! // NOTE: generics need to be cleaned before the decl!
let generics = clean_ty_generics(cx, cx.tcx.generics_of(did), predicates); let generics = clean_ty_generics(cx, cx.tcx.generics_of(did), predicates);
let decl = clean_fn_decl_from_did_and_sig(cx, did, sig); let decl = clean_fn_decl_from_did_and_sig(cx, Some(did), sig);
(generics, decl) (generics, decl)
}); });
clean::Function { clean::Function {

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

@ -890,10 +890,10 @@ fn clean_fn_decl_with_args(
fn clean_fn_decl_from_did_and_sig( fn clean_fn_decl_from_did_and_sig(
cx: &mut DocContext<'_>, cx: &mut DocContext<'_>,
did: DefId, did: Option<DefId>,
sig: ty::PolyFnSig<'_>, sig: ty::PolyFnSig<'_>,
) -> FnDecl { ) -> FnDecl {
let mut names = if did.is_local() { &[] } else { cx.tcx.fn_arg_names(did) }.iter(); let mut names = did.map_or(&[] as &[_], |did| cx.tcx.fn_arg_names(did)).iter();
FnDecl { FnDecl {
output: Return(sig.skip_binder().output().clean(cx)), output: Return(sig.skip_binder().output().clean(cx)),
@ -1067,7 +1067,7 @@ impl Clean<Item> for ty::AssocItem {
tcx.explicit_predicates_of(self.def_id), tcx.explicit_predicates_of(self.def_id),
); );
let sig = tcx.fn_sig(self.def_id); let sig = tcx.fn_sig(self.def_id);
let mut decl = clean_fn_decl_from_did_and_sig(cx, self.def_id, sig); let mut decl = clean_fn_decl_from_did_and_sig(cx, Some(self.def_id), sig);
if self.fn_has_self_parameter { if self.fn_has_self_parameter {
let self_ty = match self.container { let self_ty = match self.container {
@ -1466,8 +1466,7 @@ impl<'tcx> Clean<Type> for Ty<'tcx> {
ty::FnDef(..) | ty::FnPtr(_) => { ty::FnDef(..) | ty::FnPtr(_) => {
let ty = cx.tcx.lift(*self).expect("FnPtr lift failed"); let ty = cx.tcx.lift(*self).expect("FnPtr lift failed");
let sig = ty.fn_sig(cx.tcx); let sig = ty.fn_sig(cx.tcx);
let def_id = DefId::local(CRATE_DEF_INDEX); let decl = clean_fn_decl_from_did_and_sig(cx, None, sig);
let decl = clean_fn_decl_from_did_and_sig(cx, def_id, sig);
BareFunction(box BareFunctionDecl { BareFunction(box BareFunctionDecl {
unsafety: sig.unsafety(), unsafety: sig.unsafety(),
generic_params: Vec::new(), generic_params: Vec::new(),