Skip to content

Normalize the arg spans to be within the call span #99526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 21, 2022
Merged

Normalize the arg spans to be within the call span #99526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions compiler/rustc_typeck/src/check/fn_ctxt/checks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,6 +481,17 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
self.set_tainted_by_errors();
let tcx = self.tcx;

// Get the argument span in the context of the call span so that
// suggestions and labels are (more) correct when an arg is a
// macro invocation.
let normalize_span = |span: Span| -> Span {
let normalized_span = span.find_ancestor_inside(error_span).unwrap_or(span);
// Sometimes macros mess up the spans, so do not normalize the
// arg span to equal the error span, because that's less useful
// than pointing out the arg expr in the wrong context.
if normalized_span.source_equal(error_span) { span } else { normalized_span }
};

// Precompute the provided types and spans, since that's all we typically need for below
let provided_arg_tys: IndexVec<ProvidedIdx, (Ty<'tcx>, Span)> = provided_args
.iter()
Expand All @@ -490,7 +501,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
.borrow()
.expr_ty_adjusted_opt(*expr)
.unwrap_or_else(|| tcx.ty_error());
(self.resolve_vars_if_possible(ty), expr.span)
(self.resolve_vars_if_possible(ty), normalize_span(expr.span))
})
.collect();
let callee_expr = match &call_expr.peel_blocks().kind {
Expand Down Expand Up @@ -600,19 +611,18 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
// Take some care with spans, so we don't suggest wrapping a macro's
// innards in parenthesis, for example.
if satisfied
&& let Some(lo) =
provided_args[mismatch_idx.into()].span.find_ancestor_inside(error_span)
&& let Some(hi) = provided_args[(mismatch_idx + tys.len() - 1).into()]
.span
.find_ancestor_inside(error_span)
&& let Some((_, lo)) =
provided_arg_tys.get(ProvidedIdx::from_usize(mismatch_idx))
&& let Some((_, hi)) =
provided_arg_tys.get(ProvidedIdx::from_usize(mismatch_idx + tys.len() - 1))
{
let mut err;
if tys.len() == 1 {
// A tuple wrap suggestion actually occurs within,
// so don't do anything special here.
err = self.report_and_explain_type_error(
TypeTrace::types(
&self.misc(lo),
&self.misc(*lo),
true,
formal_and_expected_inputs[mismatch_idx.into()].1,
provided_arg_tys[mismatch_idx.into()].0,
Expand Down Expand Up @@ -1052,7 +1062,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
let suggestion_text = if let Some(provided_idx) = provided_idx
&& let (_, provided_span) = provided_arg_tys[*provided_idx]
&& let Ok(arg_text) =
source_map.span_to_snippet(provided_span.source_callsite())
source_map.span_to_snippet(provided_span)
{
arg_text
} else {
Expand Down
3 changes: 2 additions & 1 deletion src/test/ui/inference/deref-suggestion.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
macro_rules! borrow {
($x:expr) => { &$x } //~ ERROR mismatched types
($x:expr) => { &$x }
}

fn foo(_: String) {}
Expand Down Expand Up @@ -32,6 +32,7 @@ fn main() {
foo(&mut "aaa".to_owned());
//~^ ERROR mismatched types
foo3(borrow!(0));
//~^ ERROR mismatched types
foo4(&0);
assert_eq!(3i32, &3i32);
//~^ ERROR mismatched types
Expand Down
24 changes: 10 additions & 14 deletions src/test/ui/inference/deref-suggestion.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,10 @@ LL + foo("aaa".to_owned());
|

error[E0308]: mismatched types
--> $DIR/deref-suggestion.rs:2:20
--> $DIR/deref-suggestion.rs:34:10
|
LL | ($x:expr) => { &$x }
| ^^^ expected `u32`, found `&{integer}`
...
LL | foo3(borrow!(0));
| ---- ---------- in this macro invocation
| ---- ^^^^^^^^^^ expected `u32`, found `&{integer}`
| |
| arguments to this function are incorrect
|
Expand All @@ -85,18 +82,17 @@ note: function defined here
|
LL | fn foo3(_: u32) {}
| ^^^^ ------
= note: this error originates in the macro `borrow` (in Nightly builds, run with -Z macro-backtrace for more info)

error[E0308]: mismatched types
--> $DIR/deref-suggestion.rs:36:5
--> $DIR/deref-suggestion.rs:37:5
|
LL | assert_eq!(3i32, &3i32);
| ^^^^^^^^^^^^^^^^^^^^^^^ expected `i32`, found `&i32`
|
= note: this error originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info)

error[E0308]: mismatched types
--> $DIR/deref-suggestion.rs:39:17
--> $DIR/deref-suggestion.rs:40:17
|
LL | let s = S { u };
| ^
Expand All @@ -105,7 +101,7 @@ LL | let s = S { u };
| help: consider borrowing here: `u: &u`

error[E0308]: mismatched types
--> $DIR/deref-suggestion.rs:41:20
--> $DIR/deref-suggestion.rs:42:20
|
LL | let s = S { u: u };
| ^
Expand All @@ -114,7 +110,7 @@ LL | let s = S { u: u };
| help: consider borrowing here: `&u`

error[E0308]: mismatched types
--> $DIR/deref-suggestion.rs:44:17
--> $DIR/deref-suggestion.rs:45:17
|
LL | let r = R { i };
| ^ expected `u32`, found `&{integer}`
Expand All @@ -125,7 +121,7 @@ LL | let r = R { i: *i };
| ++++

error[E0308]: mismatched types
--> $DIR/deref-suggestion.rs:46:20
--> $DIR/deref-suggestion.rs:47:20
|
LL | let r = R { i: i };
| ^ expected `u32`, found `&{integer}`
Expand All @@ -136,7 +132,7 @@ LL | let r = R { i: *i };
| +

error[E0308]: mismatched types
--> $DIR/deref-suggestion.rs:55:9
--> $DIR/deref-suggestion.rs:56:9
|
LL | b
| ^ expected `i32`, found `&{integer}`
Expand All @@ -147,7 +143,7 @@ LL | *b
| +

error[E0308]: mismatched types
--> $DIR/deref-suggestion.rs:63:9
--> $DIR/deref-suggestion.rs:64:9
|
LL | b
| ^ expected `i32`, found `&{integer}`
Expand All @@ -158,7 +154,7 @@ LL | *b
| +

error[E0308]: `if` and `else` have incompatible types
--> $DIR/deref-suggestion.rs:68:12
--> $DIR/deref-suggestion.rs:69:12
|
LL | let val = if true {
| _______________-
Expand Down