From 7c28dfe113649663c1871bbbe9ad5d4f227ecf45 Mon Sep 17 00:00:00 2001 From: Rustin-Liu Date: Sat, 18 Apr 2020 11:32:39 +0800 Subject: [PATCH] Fix `has_no_input_arg` function has self check Signed-off-by: Rustin-Liu rename has_no_input_arg to has_only_self_parameter Signed-off-by: Rustin-Liu --- src/librustc_typeck/check/demand.rs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/librustc_typeck/check/demand.rs b/src/librustc_typeck/check/demand.rs index be45ada866f..5782243cbbd 100644 --- a/src/librustc_typeck/check/demand.rs +++ b/src/librustc_typeck/check/demand.rs @@ -222,7 +222,7 @@ pub fn get_conversion_methods( let mut methods = self.probe_for_return_type(span, probe::Mode::MethodCall, expected, checked_ty, hir_id); methods.retain(|m| { - self.has_no_input_arg(m) + self.has_only_self_parameter(m) && self .tcx .get_attrs(m.def_id) @@ -243,10 +243,13 @@ pub fn get_conversion_methods( methods } - // This function checks if the method isn't static and takes other arguments than `self`. - fn has_no_input_arg(&self, method: &AssocItem) -> bool { + /// This function checks whether the method is not static and does not accept other parameters than `self`. + fn has_only_self_parameter(&self, method: &AssocItem) -> bool { match method.kind { - ty::AssocKind::Fn => self.tcx.fn_sig(method.def_id).inputs().skip_binder().len() == 1, + ty::AssocKind::Fn => { + method.fn_has_self_parameter + && self.tcx.fn_sig(method.def_id).inputs().skip_binder().len() == 1 + } _ => false, } } -- 2.44.0