Rollup merge of #105882 - compiler-errors:issue-105832, r=jackh726

Don't ICE in closure arg borrow suggestion

Fixes #105832
This commit is contained in:
Dylan DPC 2022-12-19 14:41:36 +05:30 committed by GitHub
commit 3350ae9cef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 5 deletions

View file

@ -1789,7 +1789,7 @@ pub(crate) fn build_fn_sig_ty<'tcx>(
self.note_conflicting_closure_bounds(cause, &mut err);
if let Some(found_node) = found_node {
hint_missing_borrow(span, found_span, found, expected, found_node, &mut err);
hint_missing_borrow(span, found, expected, found_node, &mut err);
}
err
@ -3460,7 +3460,6 @@ fn probe_assoc_types_at_expr(
/// Add a hint to add a missing borrow or remove an unnecessary one.
fn hint_missing_borrow<'tcx>(
span: Span,
found_span: Span,
found: Ty<'tcx>,
expected: Ty<'tcx>,
found_node: Node<'_>,
@ -3479,9 +3478,8 @@ fn hint_missing_borrow<'tcx>(
}
};
let fn_decl = found_node
.fn_decl()
.unwrap_or_else(|| span_bug!(found_span, "found node must be a function"));
// This could be a variant constructor, for example.
let Some(fn_decl) = found_node.fn_decl() else { return; };
let arg_spans = fn_decl.inputs.iter().map(|ty| ty.span);

View file

@ -0,0 +1,10 @@
pub enum Sexpr<'a> {
Ident(&'a str),
}
fn map<'a, F: Fn(String) -> Sexpr<'a>>(f: F) {}
fn main() {
map(Sexpr::Ident);
//~^ ERROR type mismatch in function arguments
}

View file

@ -0,0 +1,22 @@
error[E0631]: type mismatch in function arguments
--> $DIR/enum-variant-arg-mismatch.rs:8:9
|
LL | Ident(&'a str),
| ----- found signature defined here
...
LL | map(Sexpr::Ident);
| --- ^^^^^^^^^^^^ expected due to this
| |
| required by a bound introduced by this call
|
= note: expected function signature `fn(String) -> _`
found function signature `fn(&str) -> _`
note: required by a bound in `map`
--> $DIR/enum-variant-arg-mismatch.rs:5:15
|
LL | fn map<'a, F: Fn(String) -> Sexpr<'a>>(f: F) {}
| ^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `map`
error: aborting due to previous error
For more information about this error, try `rustc --explain E0631`.