bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Adjust normalization

Browse source
This commit is contained in:
mejrs 2022-10-26 13:41:57 +02:00
parent 447d57f036
commit 60dbffba29
12 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/test/rustdoc-ui/track-diagnostics.rs
View file

@ -3,7 +3,7 @@
// Normalize the emitted location so this doesn't need // Normalize the emitted location so this doesn't need
// updating everytime someone adds or removes a line. // updating everytime someone adds or removes a line.
// normalize-stderr-test ".rs:\d+:\d+" -> ".rs:$$LINE::$$COL" // normalize-stderr-test ".rs:\d+:\d+" -> ".rs:LL:CC"
struct A; struct A;
struct B; struct B;

4
src/test/rustdoc-ui/track-diagnostics.stderr
View file

@ -1,9 +1,9 @@
error[E0308]: mismatched types error[E0308]: mismatched types
--> $DIR/track-diagnostics.rs:$LINE::$COL --> $DIR/track-diagnostics.rs:LL:CC
| |
LL | const S: A = B; LL | const S: A = B;
| ^ expected struct `A`, found struct `B` | ^ expected struct `A`, found struct `B`
-Ztrack-diagnostics: created at compiler/rustc_infer/src/infer/error_reporting/mod.rs:$LINE::$COL -Ztrack-diagnostics: created at compiler/rustc_infer/src/infer/error_reporting/mod.rs:LL:CC
error: aborting due to previous error error: aborting due to previous error

2
src/test/ui/track-diagnostics/track.rs
View file

@ -3,7 +3,7 @@
// Normalize the emitted location so this doesn't need // Normalize the emitted location so this doesn't need
// updating everytime someone adds or removes a line. // updating everytime someone adds or removes a line.
// normalize-stderr-test ".rs:\d+:\d+" -> ".rs:$$LINE::$$COL" // normalize-stderr-test ".rs:\d+:\d+" -> ".rs:LL:CC"
// normalize-stderr-test "note: rustc .+ running on .+" -> "note: rustc $$VERSION running on $$TARGET" // normalize-stderr-test "note: rustc .+ running on .+" -> "note: rustc $$VERSION running on $$TARGET"
fn main() { fn main() {

8
src/test/ui/track-diagnostics/track.stderr
View file

@ -1,16 +1,16 @@
error[E0425]: cannot find value `rust` in this scope error[E0425]: cannot find value `rust` in this scope
--> $DIR/track.rs:$LINE::$COL --> $DIR/track.rs:LL:CC
| |
LL | break rust LL | break rust
| ^^^^ not found in this scope | ^^^^ not found in this scope
-Ztrack-diagnostics: created at compiler/rustc_resolve/src/late/diagnostics.rs:$LINE::$COL -Ztrack-diagnostics: created at compiler/rustc_resolve/src/late/diagnostics.rs:LL:CC
error[E0268]: `break` outside of a loop error[E0268]: `break` outside of a loop
--> $DIR/track.rs:$LINE::$COL --> $DIR/track.rs:LL:CC
| |
LL | break rust LL | break rust
| ^^^^^^^^^^ cannot `break` outside of a loop | ^^^^^^^^^^ cannot `break` outside of a loop
-Ztrack-diagnostics: created at compiler/rustc_passes/src/errors.rs:$LINE::$COL -Ztrack-diagnostics: created at compiler/rustc_passes/src/errors.rs:LL:CC
error: internal compiler error: It looks like you're trying to break rust; would you like some ICE? error: internal compiler error: It looks like you're trying to break rust; would you like some ICE?

2
src/test/ui/track-diagnostics/track2.rs
View file

@ -3,7 +3,7 @@
// Normalize the emitted location so this doesn't need // Normalize the emitted location so this doesn't need
// updating everytime someone adds or removes a line. // updating everytime someone adds or removes a line.
// normalize-stderr-test ".rs:\d+:\d+" -> ".rs:$$LINE::$$COL" // normalize-stderr-test ".rs:\d+:\d+" -> ".rs:LL:CC"
fn main() { fn main() {
let _moved @ _from = String::from("foo"); let _moved @ _from = String::from("foo");

4
src/test/ui/track-diagnostics/track2.stderr
View file

@ -1,12 +1,12 @@
error[E0382]: use of moved value error[E0382]: use of moved value
--> $DIR/track2.rs:$LINE::$COL --> $DIR/track2.rs:LL:CC
| |
LL | let _moved @ _from = String::from("foo"); LL | let _moved @ _from = String::from("foo");
| ^^^^^^ ----- ------------------- move occurs because value has type `String`, which does not implement the `Copy` trait | ^^^^^^ ----- ------------------- move occurs because value has type `String`, which does not implement the `Copy` trait
| | | | | |
| | value moved here | | value moved here
| value used here after move | value used here after move
-Ztrack-diagnostics: created at compiler/rustc_borrowck/src/borrowck_errors.rs:$LINE::$COL -Ztrack-diagnostics: created at compiler/rustc_borrowck/src/borrowck_errors.rs:LL:CC
error: aborting due to previous error error: aborting due to previous error

2
src/test/ui/track-diagnostics/track3.rs
View file

@ -3,7 +3,7 @@
// Normalize the emitted location so this doesn't need // Normalize the emitted location so this doesn't need
// updating everytime someone adds or removes a line. // updating everytime someone adds or removes a line.
// normalize-stderr-test ".rs:\d+:\d+" -> ".rs:$$LINE::$$COL" // normalize-stderr-test ".rs:\d+:\d+" -> ".rs:LL:CC"
fn main() { fn main() {
let _unimported = Blah { field: u8 }; let _unimported = Blah { field: u8 };

8
src/test/ui/track-diagnostics/track3.stderr
View file

@ -1,16 +1,16 @@
error[E0422]: cannot find struct, variant or union type `Blah` in this scope error[E0422]: cannot find struct, variant or union type `Blah` in this scope
--> $DIR/track3.rs:$LINE::$COL --> $DIR/track3.rs:LL:CC
| |
LL | let _unimported = Blah { field: u8 }; LL | let _unimported = Blah { field: u8 };
| ^^^^ not found in this scope | ^^^^ not found in this scope
-Ztrack-diagnostics: created at compiler/rustc_resolve/src/late/diagnostics.rs:$LINE::$COL -Ztrack-diagnostics: created at compiler/rustc_resolve/src/late/diagnostics.rs:LL:CC
error[E0423]: expected value, found builtin type `u8` error[E0423]: expected value, found builtin type `u8`
--> $DIR/track3.rs:$LINE::$COL --> $DIR/track3.rs:LL:CC
| |
LL | let _unimported = Blah { field: u8 }; LL | let _unimported = Blah { field: u8 };
| ^^ not a value | ^^ not a value
-Ztrack-diagnostics: created at compiler/rustc_resolve/src/late/diagnostics.rs:$LINE::$COL -Ztrack-diagnostics: created at compiler/rustc_resolve/src/late/diagnostics.rs:LL:CC
error: aborting due to 2 previous errors error: aborting due to 2 previous errors

2
src/test/ui/track-diagnostics/track4.rs
View file

@ -3,7 +3,7 @@
// Normalize the emitted location so this doesn't need // Normalize the emitted location so this doesn't need
// updating everytime someone adds or removes a line. // updating everytime someone adds or removes a line.
// normalize-stderr-test ".rs:\d+:\d+" -> ".rs:$$LINE::$$COL" // normalize-stderr-test ".rs:\d+:\d+" -> ".rs:LL:CC"
pub onion { pub onion {
Owo(u8), Owo(u8),

4
src/test/ui/track-diagnostics/track4.stderr
View file

@ -1,9 +1,9 @@
error: missing `struct` for struct definition error: missing `struct` for struct definition
--> $DIR/track4.rs:$LINE::$COL --> $DIR/track4.rs:LL:CC
| |
LL | pub onion { LL | pub onion {
| ^ | ^
-Ztrack-diagnostics: created at compiler/rustc_parse/src/parser/diagnostics.rs:$LINE::$COL -Ztrack-diagnostics: created at compiler/rustc_parse/src/parser/diagnostics.rs:LL:CC
| |
help: add `struct` here to parse `onion` as a public struct help: add `struct` here to parse `onion` as a public struct
| |

2
src/tools/clippy/tests/ui/track-diagnostics.rs
View file

@ -3,7 +3,7 @@
// Normalize the emitted location so this doesn't need // Normalize the emitted location so this doesn't need
// updating everytime someone adds or removes a line. // updating everytime someone adds or removes a line.
// normalize-stderr-test ".rs:\d+:\d+" -> ".rs:$$LINE::$$COL" // normalize-stderr-test ".rs:\d+:\d+" -> ".rs:LL:CC"
struct A; struct A;
struct B; struct B;

4
src/tools/clippy/tests/ui/track-diagnostics.stderr
View file

@ -1,9 +1,9 @@
error[E0308]: mismatched types error[E0308]: mismatched types
--> $DIR/track-diagnostics.rs:$LINE::$COL --> $DIR/track-diagnostics.rs:LL:CC
| |
LL | const S: A = B; LL | const S: A = B;
| ^ expected struct `A`, found struct `B` | ^ expected struct `A`, found struct `B`
-Ztrack-diagnostics: created at compiler/rustc_infer/src/infer/error_reporting/mod.rs:$LINE::$COL -Ztrack-diagnostics: created at compiler/rustc_infer/src/infer/error_reporting/mod.rs:LL:CC
error: aborting due to previous error error: aborting due to previous error