Skip to content

Commit f7ef35b

Browse files
authored
Rollup merge of #138242 - tshepang:that-stage0-has-arrived, r=jieyouxu
Revert "Don't test new error messages with the stage 0 compiler"
2 parents 37ff680 + 20ed8fb commit f7ef35b

4 files changed

+6
-8
lines changed

tests/ui-fulldeps/hash-stable-is-unstable.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
//@ ignore-stage1 FIXME: this line can be removed once these new error messages are in stage 0 rustc
21
//@ compile-flags: -Zdeduplicate-diagnostics=yes
32
extern crate rustc_data_structures;
43
//~^ use of unstable library feature `rustc_private`

tests/ui-fulldeps/hash-stable-is-unstable.stderr

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0658]: use of unstable library feature `rustc_private`: this crate is being loaded from the sysroot, an unstable location; did you mean to load this crate from crates.io via `Cargo.toml` instead?
2-
--> $DIR/hash-stable-is-unstable.rs:3:1
2+
--> $DIR/hash-stable-is-unstable.rs:2:1
33
|
44
LL | extern crate rustc_data_structures;
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -9,7 +9,7 @@ LL | extern crate rustc_data_structures;
99
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
1010

1111
error[E0658]: use of unstable library feature `rustc_private`: this crate is being loaded from the sysroot, an unstable location; did you mean to load this crate from crates.io via `Cargo.toml` instead?
12-
--> $DIR/hash-stable-is-unstable.rs:7:1
12+
--> $DIR/hash-stable-is-unstable.rs:6:1
1313
|
1414
LL | extern crate rustc_macros;
1515
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -19,7 +19,7 @@ LL | extern crate rustc_macros;
1919
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
2020

2121
error[E0658]: use of unstable library feature `rustc_private`: this crate is being loaded from the sysroot, an unstable location; did you mean to load this crate from crates.io via `Cargo.toml` instead?
22-
--> $DIR/hash-stable-is-unstable.rs:11:1
22+
--> $DIR/hash-stable-is-unstable.rs:10:1
2323
|
2424
LL | extern crate rustc_query_system;
2525
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -29,7 +29,7 @@ LL | extern crate rustc_query_system;
2929
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
3030

3131
error[E0658]: use of unstable library feature `rustc_private`: this crate is being loaded from the sysroot, an unstable location; did you mean to load this crate from crates.io via `Cargo.toml` instead?
32-
--> $DIR/hash-stable-is-unstable.rs:16:5
32+
--> $DIR/hash-stable-is-unstable.rs:15:5
3333
|
3434
LL | use rustc_macros::HashStable;
3535
| ^^^^^^^^^^^^^^^^^^^^^^^^
@@ -39,7 +39,7 @@ LL | use rustc_macros::HashStable;
3939
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
4040

4141
error[E0658]: use of unstable library feature `rustc_private`: this crate is being loaded from the sysroot, an unstable location; did you mean to load this crate from crates.io via `Cargo.toml` instead?
42-
--> $DIR/hash-stable-is-unstable.rs:21:10
42+
--> $DIR/hash-stable-is-unstable.rs:20:10
4343
|
4444
LL | #[derive(HashStable)]
4545
| ^^^^^^^^^^

tests/ui-fulldeps/pathless-extern-unstable.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
//@ ignore-stage1 FIXME: this line can be removed once these new error messages are in stage 0 rustc
21
//@ edition:2018
32
//@ compile-flags:--extern rustc_middle
43

tests/ui-fulldeps/pathless-extern-unstable.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0658]: use of unstable library feature `rustc_private`: this crate is being loaded from the sysroot, an unstable location; did you mean to load this crate from crates.io via `Cargo.toml` instead?
2-
--> $DIR/pathless-extern-unstable.rs:7:9
2+
--> $DIR/pathless-extern-unstable.rs:6:9
33
|
44
LL | pub use rustc_middle;
55
| ^^^^^^^^^^^^

0 commit comments

Comments
 (0)