Avoid span overlap in type mismatch

estebank · estebank · commit 101a0c6bcb1b · 2025-01-17T19:52:20.000Z
diff --git a/compiler/rustc_trait_selection/src/error_reporting/infer/mod.rs b/compiler/rustc_trait_selection/src/error_reporting/infer/mod.rs
@@ -456,7 +456,7 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
                             span,
                             format!("this is an iterator with items of type `{}`", args.type_at(0)),
                         );
-                    } else {
+                    } else if !span.overlaps(cause.span) {
                         err.span_label(span, format!("this expression has type `{expected_ty}`"));
                     }
                 }
diff --git a/tests/ui/codemap_tests/issue-28308.edition2024.stderr b/tests/ui/codemap_tests/issue-28308.edition2024.stderr
diff --git a/tests/ui/codemap_tests/issue-28308.rs b/tests/ui/codemap_tests/issue-28308.rs
@@ -1,9 +1,4 @@
-//@revisions: edition2024 edition2021
-//@[edition2024] edition:2024
-//@[edition2024] compile-flags: -Z unstable-options
-//@[edition2021] edition:2021
 fn main() {
     assert!("foo");
-    //[edition2024]~^ ERROR mismatched types
-    //[edition2021]~^^ ERROR mismatched types
+    //~^ ERROR mismatched types
 }
diff --git a/tests/ui/codemap_tests/issue-28308.stderr b/tests/ui/codemap_tests/issue-28308.stderr
@@ -1,11 +1,8 @@
 error[E0308]: mismatched types
-  --> $DIR/issue-28308.rs:6:13
+  --> $DIR/issue-28308.rs:2:13
    |
 LL |     assert!("foo");
-   |             ^^^^^
-   |             |
-   |             expected `str`, found `bool`
-   |             this expression has type `&str`
+   |             ^^^^^ expected `str`, found `bool`
    |
    = note: this error originates in the macro `assert` (in Nightly builds, run with -Z macro-backtrace for more info)
 
diff --git a/tests/ui/issues/issue-14091-2.stderr b/tests/ui/issues/issue-14091-2.stderr
@@ -2,10 +2,7 @@ error[E0308]: mismatched types
   --> $DIR/issue-14091-2.rs:15:13
    |
 LL |     assert!(x, x);
-   |             ^
-   |             |
-   |             expected `BytePos`, found `bool`
-   |             this expression has type `BytePos`
+   |             ^ expected `BytePos`, found `bool`
    |
    = note: this error originates in the macro `assert` (in Nightly builds, run with -Z macro-backtrace for more info)
 
diff --git a/tests/ui/issues/issue-14091.stderr b/tests/ui/issues/issue-14091.stderr
@@ -2,10 +2,7 @@ error[E0308]: mismatched types
   --> $DIR/issue-14091.rs:2:13
    |
 LL |     assert!(1,1);
-   |             ^
-   |             |
-   |             expected integer, found `bool`
-   |             this expression has type `{integer}`
+   |             ^ expected integer, found `bool`
    |
    = note: this error originates in the macro `assert` (in Nightly builds, run with -Z macro-backtrace for more info)
 

Original file line number	Diff line number	Diff line change
`@@ -456,7 +456,7 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {`
`456`	`456`	`span,`
`457`	`457`	format!("this is an iterator with items of type `{}`", args.type_at(0)),
`458`	`458`	`);`
`459`		`- } else {`
	`459`	`+ } else if !span.overlaps(cause.span) {`
`460`	`460`	err.span_label(span, format!("this expression has type `{expected_ty}`"));
`461`	`461`	`}`
`462`	`462`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,8 @@`
`1`	`1`	`error[E0308]: mismatched types`
`2`		`- --> $DIR/issue-28308.rs:6:13`
	`2`	`+ --> $DIR/issue-28308.rs:2:13`
`3`	`3`	`\|`
`4`	`4`	`LL \| assert!("foo");`
`5`		`- \| ^^^^^`
`6`		`- \| \|`
`7`		- \| expected `str`, found `bool`
`8`		- \| this expression has type `&str`
	`5`	+ \| ^^^^^ expected `str`, found `bool`
`9`	`6`	`\|`
`10`	`7`	= note: this error originates in the macro `assert` (in Nightly builds, run with -Z macro-backtrace for more info)
`11`	`8`
Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,7 @@ error[E0308]: mismatched types`
`2`	`2`	`--> $DIR/issue-14091-2.rs:15:13`
`3`	`3`	`\|`
`4`	`4`	`LL \| assert!(x, x);`
`5`		`- \| ^`
`6`		`- \| \|`
`7`		- \| expected `BytePos`, found `bool`
`8`		- \| this expression has type `BytePos`
	`5`	+ \| ^ expected `BytePos`, found `bool`
`9`	`6`	`\|`
`10`	`7`	= note: this error originates in the macro `assert` (in Nightly builds, run with -Z macro-backtrace for more info)
`11`	`8`
Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,7 @@ error[E0308]: mismatched types`
`2`	`2`	`--> $DIR/issue-14091.rs:2:13`
`3`	`3`	`\|`
`4`	`4`	`LL \| assert!(1,1);`
`5`		`- \| ^`
`6`		`- \| \|`
`7`		- \| expected integer, found `bool`
`8`		- \| this expression has type `{integer}`
	`5`	+ \| ^ expected integer, found `bool`
`9`	`6`	`\|`
`10`	`7`	= note: this error originates in the macro `assert` (in Nightly builds, run with -Z macro-backtrace for more info)
`11`	`8`