forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of rust-lang#105188 - compiler-errors:verbose-ty-err, r=…
…TaKO8Ki Don't elide type information when printing E0308 with `-Zverbose` When we pass `-Zverbose`, we kinda expect for all `_` to be replaced with more descriptive information, for example -- ``` = note: expected fn pointer `fn(_, u32)` found fn item `fn(_, i32) {foo}` ``` Where `_` is the "identical" part of the fn signatures, now gets rendered as: ``` = note: expected fn pointer `fn(i32, u32)` found fn item `fn(i32, i32) {foo}` ```
- Loading branch information
Showing
3 changed files
with
37 additions
and
3 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 |
---|---|---|
@@ -0,0 +1,15 @@ | ||
// compile-flags: -Zverbose | ||
|
||
fn foo(_: i32, _: i32) {} | ||
|
||
fn needs_ptr(_: fn(i32, u32)) {} | ||
//~^ NOTE function defined here | ||
//~| NOTE | ||
|
||
fn main() { | ||
needs_ptr(foo); | ||
//~^ ERROR mismatched types | ||
//~| NOTE expected `u32`, found `i32` | ||
//~| NOTE expected fn pointer `fn(i32, u32)` | ||
//~| NOTE arguments to this function are incorrect | ||
} |
19 changes: 19 additions & 0 deletions
19
src/test/ui/fn/signature-error-reporting-under-verbose.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 |
---|---|---|
@@ -0,0 +1,19 @@ | ||
error[E0308]: mismatched types | ||
--> $DIR/signature-error-reporting-under-verbose.rs:10:15 | ||
| | ||
LL | needs_ptr(foo); | ||
| --------- ^^^ expected `u32`, found `i32` | ||
| | | ||
| arguments to this function are incorrect | ||
| | ||
= note: expected fn pointer `fn(i32, u32)` | ||
found fn item `fn(i32, i32) {foo}` | ||
note: function defined here | ||
--> $DIR/signature-error-reporting-under-verbose.rs:5:4 | ||
| | ||
LL | fn needs_ptr(_: fn(i32, u32)) {} | ||
| ^^^^^^^^^ --------------- | ||
|
||
error: aborting due to previous error | ||
|
||
For more information about this error, try `rustc --explain E0308`. |