Skip to content

Commit 44a3173

Browse files
authored
Unrolled build for rust-lang#119655
Rollup merge of rust-lang#119655 - Nilstrieb:cleanup-the-error-count-monster-mess, r=WaffleLapkin Remove ignore-stage1 that was added when changing error count msg The bootstrap bump has happened, so the bootstrap compiler now contains the new diagnostic. this was added in rust-lang#118138
2 parents 9212108 + 5c74329 commit 44a3173

10 files changed

+6
-13
lines changed

tests/ui-fulldeps/dropck-tarena-cycle-checked.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// ignore-stage1
2-
31
// Reject mixing cyclic structure and Drop when using TypedArena.
42
//
53
// (Compare against dropck-vec-cycle-checked.rs)

tests/ui-fulldeps/dropck-tarena-cycle-checked.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0597]: `arena` does not live long enough
2-
--> $DIR/dropck-tarena-cycle-checked.rs:118:7
2+
--> $DIR/dropck-tarena-cycle-checked.rs:116:7
33
|
44
LL | let arena = TypedArena::default();
55
| ----- binding `arena` declared here

tests/ui-fulldeps/dropck-tarena-unsound-drop.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// ignore-stage1
2-
31
// Check that an arena (TypedArena) cannot carry elements whose drop
42
// methods might access borrowed data of lifetime that does not
53
// strictly outlive the arena itself.

tests/ui-fulldeps/dropck-tarena-unsound-drop.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0597]: `arena` does not live long enough
2-
--> $DIR/dropck-tarena-unsound-drop.rs:43:7
2+
--> $DIR/dropck-tarena-unsound-drop.rs:41:7
33
|
44
LL | let arena: TypedArena<C> = TypedArena::default();
55
| ----- binding `arena` declared here

tests/ui-fulldeps/internal-lints/span_use_eq_ctxt.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// Test the `rustc::span_use_eq_ctxt` internal lint
22
// compile-flags: -Z unstable-options
3-
// ignore-stage1
43

54
#![feature(rustc_private)]
65
#![deny(rustc::span_use_eq_ctxt)]

tests/ui-fulldeps/internal-lints/span_use_eq_ctxt.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error: use `.eq_ctxt()` instead of `.ctxt() == .ctxt()`
2-
--> $DIR/span_use_eq_ctxt.rs:13:5
2+
--> $DIR/span_use_eq_ctxt.rs:12:5
33
|
44
LL | s.ctxt() == t.ctxt()
55
| ^^^^^^^^^^^^^^^^^^^^
66
|
77
note: the lint level is defined here
8-
--> $DIR/span_use_eq_ctxt.rs:6:9
8+
--> $DIR/span_use_eq_ctxt.rs:5:9
99
|
1010
LL | #![deny(rustc::span_use_eq_ctxt)]
1111
| ^^^^^^^^^^^^^^^^^^^^^^^

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

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// edition:2018
22
// compile-flags:--extern rustc_middle
3-
// ignore-stage1
43

54
// Test that `--extern rustc_middle` fails with `rustc_private`.
65

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
| ^^^^^^^^^^^^

tests/ui-fulldeps/session-diagnostic/enforce_slug_naming.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// rustc-env:CARGO_CRATE_NAME=rustc_dummy
2-
// ignore-stage1
32

43
#![feature(rustc_private)]
54
#![crate_type = "lib"]

tests/ui-fulldeps/session-diagnostic/enforce_slug_naming.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: diagnostic slug and crate name do not match
2-
--> $DIR/enforce_slug_naming.rs:23:8
2+
--> $DIR/enforce_slug_naming.rs:22:8
33
|
44
LL | #[diag(compiletest_example, code = "E0123")]
55
| ^^^^^^^^^^^^^^^^^^^

0 commit comments

Comments
 (0)