Skip to content

Commit

Permalink
Rollup merge of #113578 - compiler-errors:uncallable-sig, r=b-naber
Browse files Browse the repository at this point in the history
Don't say that a type is uncallable if its fn signature has errors in it

This is fallout from #106309, where we don't consider param-env candidates that reference errors because they unify with everything. This means, however, that we don't consider an APIT like `impl Fn(MissingType)` isn't considered to implement `Fn`, for example.

We can double-check that with a weaker heuristic [`extract_callable_info`](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_hir_typeck/fn_ctxt/struct.FnCtxt.html#method.extract_callable_info), and suppress the knock-down error using that.

Fixes #113566
  • Loading branch information
matthiaskrgr authored Jul 25, 2023
2 parents c5c0aa1 + c0c2d39 commit a6bf68d
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 0 deletions.
8 changes: 8 additions & 0 deletions compiler/rustc_hir_typeck/src/callee.rs
Original file line number Diff line number Diff line change
Expand Up @@ -581,6 +581,14 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
callee_ty: Ty<'tcx>,
arg_exprs: &'tcx [hir::Expr<'tcx>],
) -> ErrorGuaranteed {
// Callee probe fails when APIT references errors, so suppress those
// errors here.
if let Some((_, _, args)) = self.extract_callable_info(callee_ty)
&& let Err(err) = args.error_reported()
{
return err;
}

let mut unit_variant = None;
if let hir::ExprKind::Path(qpath) = &callee_expr.kind
&& let Res::Def(def::DefKind::Ctor(kind, CtorKind::Const), _)
Expand Down
8 changes: 8 additions & 0 deletions tests/ui/typeck/apit-with-error-type-in-sig.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
type Foo = Bar;
//~^ ERROR cannot find type `Bar` in this scope

fn check(f: impl FnOnce(Foo), val: Foo) {
f(val);
}

fn main() {}
9 changes: 9 additions & 0 deletions tests/ui/typeck/apit-with-error-type-in-sig.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
error[E0412]: cannot find type `Bar` in this scope
--> $DIR/apit-with-error-type-in-sig.rs:1:12
|
LL | type Foo = Bar;
| ^^^ not found in this scope

error: aborting due to previous error

For more information about this error, try `rustc --explain E0412`.

0 comments on commit a6bf68d

Please sign in to comment.