Suggest adding Fn bound when calling a generic parameter

Author: Kobzol

compiler/rustc_hir_typeck/src/callee.rs

@@ -25,6 +25,7 @@ use tracing::{debug, instrument};
 use super::method::MethodCallee;
 use super::method::probe::ProbeScope;
 use super::{Expectation, FnCtxt, TupleArgumentsFlag};
+use crate::expr_use_visitor::TypeInformationCtxt;
 use crate::{errors, fluent_generated};
 
 /// Checks that it is legal to call methods of the trait corresponding
@@ -122,7 +123,13 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                     );
                 }
 
-                let guar = self.report_invalid_callee(call_expr, callee_expr, expr_ty, arg_exprs);
+                let guar = self.report_invalid_callee(
+                    call_expr,
+                    callee_expr,
+                    expr_ty,
+                    arg_exprs,
+                    expected,
+                );
                 Ty::new_error(self.tcx, guar)
             }
 
@@ -677,6 +684,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         callee_expr: &'tcx hir::Expr<'tcx>,
         callee_ty: Ty<'tcx>,
         arg_exprs: &'tcx [hir::Expr<'tcx>],
+        expected: Expectation<'tcx>,
     ) -> ErrorGuaranteed {
         // Callee probe fails when APIT references errors, so suppress those
         // errors here.
@@ -806,6 +814,29 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                     err.span_label(def_span, "the callable type is defined here");
                 }
             } else {
+                // Suggest adding <Param>: Fn(...) [-> RetType]
+                if callee_ty.has_non_region_param() {
+                    let arg_types: Vec<Ty<'tcx>> = arg_exprs
+                        .iter()
+                        .map(|arg| self.typeck_results.borrow().expr_ty(arg))
+                        .collect();
+                    let args_tuple = Ty::new_tup(self.tcx(), &arg_types);
+
+                    let fn_def_id = self.tcx().require_lang_item(LangItem::Fn, callee_expr.span);
+                    let trait_ref =
+                        ty::TraitRef::new(self.tcx(), fn_def_id, [callee_ty, args_tuple]);
+
+                    let trait_pred =
+                        ty::TraitPredicate { trait_ref, polarity: ty::PredicatePolarity::Positive };
+
+                    let associated_ty = expected.to_option(self).map(|ty| ("Output", ty));
+                    self.err_ctxt().suggest_restricting_param_bound(
+                        &mut err,
+                        ty::Binder::dummy(trait_pred),
+                        associated_ty,
+                        self.body_id,
+                    );
+                }
                 err.span_label(call_expr.span, "call expression requires function");
             }
         }

compiler/rustc_trait_selection/src/error_reporting/traits/suggestions.rs

@@ -23,6 +23,7 @@ use rustc_hir::{
 };
 use rustc_infer::infer::{BoundRegionConversionTime, DefineOpaqueTypes, InferCtxt, InferOk};
 use rustc_middle::middle::privacy::Level;
+use rustc_middle::query::Key;
 use rustc_middle::traits::IsConstable;
 use rustc_middle::ty::error::TypeError;
 use rustc_middle::ty::print::{
@@ -388,12 +389,19 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
                     );
 
                     if let Some((name, term)) = associated_ty {
-                        // FIXME: this case overlaps with code in TyCtxt::note_and_explain_type_err.
-                        // That should be extracted into a helper function.
-                        if let Some(stripped) = constraint.strip_suffix('>') {
-                            constraint = format!("{stripped}, {name} = {term}>");
+                        let fn_def_id = self
+                            .tcx
+                            .require_lang_item(LangItem::Fn, body_id.default_span(self.tcx));
+                        if fn_def_id == trait_pred.skip_binder().trait_ref.def_id {
+                            constraint.push_str(&format!(" -> {term}"));
                         } else {
-                            constraint.push_str(&format!("<{name} = {term}>"));
+                            // FIXME: this case overlaps with code in TyCtxt::note_and_explain_type_err.
+                            // That should be extracted into a helper function.
+                            if let Some(stripped) = constraint.strip_suffix('>') {
+                                constraint = format!("{stripped}, {name} = {term}>");
+                            } else {
+                                constraint.push_str(&format!("<{name} = {term}>"));
+                            }
                         }
                     }
 

tests/ui/suggestions/suggest-call-on-generic-param.rs

@@ -0,0 +1,16 @@
+fn return_type<T>(t: T) {
+    let x: u32 = t(1);
+    //~^ ERROR: expected function, found `T` [E0618]
+}
+
+fn no_return_type<T>(t: T) {
+    t(1, 2, true);
+    //~^ ERROR: expected function, found `T` [E0618]
+}
+
+fn existing_bound<T: Copy>(t: T) {
+    t(false);
+    //~^ ERROR: expected function, found `T` [E0618]
+}
+
+fn main() {}

tests/ui/suggestions/suggest-call-on-generic-param.stderr

@@ -0,0 +1,48 @@
+error[E0618]: expected function, found `T`
+  --> $DIR/suggest-call-on-generic-param.rs:2:18
+   |
+LL | fn return_type<T>(t: T) {
+   |                   - `t` has type `T`
+LL |     let x: u32 = t(1);
+   |                  ^---
+   |                  |
+   |                  call expression requires function
+   |
+help: consider restricting type parameter `T` with trait `Fn`
+   |
+LL | fn return_type<T: Fn(i32) -> u32>(t: T) {
+   |                 ++++++++++++++++
+
+error[E0618]: expected function, found `T`
+  --> $DIR/suggest-call-on-generic-param.rs:7:5
+   |
+LL | fn no_return_type<T>(t: T) {
+   |                      - `t` has type `T`
+LL |     t(1, 2, true);
+   |     ^------------
+   |     |
+   |     call expression requires function
+   |
+help: consider restricting type parameter `T` with trait `Fn`
+   |
+LL | fn no_return_type<T: Fn(i32, i32, bool)>(t: T) {
+   |                    ++++++++++++++++++++
+
+error[E0618]: expected function, found `T`
+  --> $DIR/suggest-call-on-generic-param.rs:12:5
+   |
+LL | fn existing_bound<T: Copy>(t: T) {
+   |                            - `t` has type `T`
+LL |     t(false);
+   |     ^-------
+   |     |
+   |     call expression requires function
+   |
+help: consider further restricting type parameter `T` with trait `Fn`
+   |
+LL | fn existing_bound<T: Copy + Fn(bool)>(t: T) {
+   |                           ++++++++++
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0618`.