-
Notifications
You must be signed in to change notification settings - Fork 12.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Special case the situation where the previous span is the same as the…
… new one
- Loading branch information
Showing
5 changed files
with
17 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,11 @@ | ||
error: concrete type differs from previous defining opaque type use | ||
--> $DIR/issue-86465.rs:6:5 | ||
| | ||
LL | (a, a) | ||
| ^^^^^^ expected `&'a u32`, got `&'b u32` | ||
| | ||
note: previous use here | ||
--> $DIR/issue-86465.rs:6:5 | ||
| | ||
LL | (a, a) | ||
| ^^^^^^ | ||
| | | ||
| expected `&'a u32`, got `&'b u32` | ||
| this expression supplies two conflicting concrete types for the same opaque type | ||
|
||
error: aborting due to previous error | ||
|
9 changes: 3 additions & 6 deletions
9
src/test/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn-infer.stderr
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,11 @@ | ||
error: concrete type differs from previous defining opaque type use | ||
--> $DIR/multiple-def-uses-in-one-fn-infer.rs:10:5 | ||
| | ||
LL | (42_i64, 60) | ||
| ^^^^^^^^^^^^ expected `i64`, got `i32` | ||
| | ||
note: previous use here | ||
--> $DIR/multiple-def-uses-in-one-fn-infer.rs:10:5 | ||
| | ||
LL | (42_i64, 60) | ||
| ^^^^^^^^^^^^ | ||
| | | ||
| expected `i64`, got `i32` | ||
| this expression supplies two conflicting concrete types for the same opaque type | ||
|
||
error: aborting due to previous error | ||
|
9 changes: 3 additions & 6 deletions
9
src/test/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn-lifetimes.stderr
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,11 @@ | ||
error: concrete type differs from previous defining opaque type use | ||
--> $DIR/multiple-def-uses-in-one-fn-lifetimes.rs:6:5 | ||
| | ||
LL | (i, i) | ||
| ^^^^^^ expected `&'a i32`, got `&'b i32` | ||
| | ||
note: previous use here | ||
--> $DIR/multiple-def-uses-in-one-fn-lifetimes.rs:6:5 | ||
| | ||
LL | (i, i) | ||
| ^^^^^^ | ||
| | | ||
| expected `&'a i32`, got `&'b i32` | ||
| this expression supplies two conflicting concrete types for the same opaque type | ||
|
||
error: aborting due to previous error | ||
|
9 changes: 3 additions & 6 deletions
9
src/test/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn2.stderr
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,11 @@ | ||
error: concrete type differs from previous defining opaque type use | ||
--> $DIR/multiple-def-uses-in-one-fn2.rs:10:5 | ||
| | ||
LL | (a.clone(), a) | ||
| ^^^^^^^^^^^^^^ expected `A`, got `B` | ||
| | ||
note: previous use here | ||
--> $DIR/multiple-def-uses-in-one-fn2.rs:10:5 | ||
| | ||
LL | (a.clone(), a) | ||
| ^^^^^^^^^^^^^^ | ||
| | | ||
| expected `A`, got `B` | ||
| this expression supplies two conflicting concrete types for the same opaque type | ||
|
||
error: aborting due to previous error | ||
|