Skip to content

Commit c73d392

Browse files
committed
Bless ui-fulldeps
We have to ignore some tests in stage1.
1 parent 9b80d85 commit c73d392

10 files changed

+18
-11
lines changed

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

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

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

+2-2
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:116:7
2+
--> $DIR/dropck-tarena-cycle-checked.rs:118:7
33
|
44
LL | let arena = TypedArena::default();
55
| ----- binding `arena` declared here
@@ -11,6 +11,6 @@ LL | }
1111
| `arena` dropped here while still borrowed
1212
| borrow might be used here, when `arena` is dropped and runs the `Drop` code for type `TypedArena`
1313

14-
error: aborting due to previous error
14+
error: aborting due to 1 previous error
1515

1616
For more information about this error, try `rustc --explain E0597`.

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

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

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

+2-2
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:41:7
2+
--> $DIR/dropck-tarena-unsound-drop.rs:43:7
33
|
44
LL | let arena: TypedArena<C> = TypedArena::default();
55
| ----- binding `arena` declared here
@@ -11,6 +11,6 @@ LL | }
1111
| `arena` dropped here while still borrowed
1212
| borrow might be used here, when `arena` is dropped and runs the `Drop` code for type `TypedArena`
1313

14-
error: aborting due to previous error
14+
error: aborting due to 1 previous error
1515

1616
For more information about this error, try `rustc --explain E0597`.

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

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

45
#![feature(rustc_private)]
56
#![deny(rustc::span_use_eq_ctxt)]
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
error: use `.eq_ctxt()` instead of `.ctxt() == .ctxt()`
2-
--> $DIR/span_use_eq_ctxt.rs:12:5
2+
--> $DIR/span_use_eq_ctxt.rs:13: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:5:9
8+
--> $DIR/span_use_eq_ctxt.rs:6:9
99
|
1010
LL | #![deny(rustc::span_use_eq_ctxt)]
1111
| ^^^^^^^^^^^^^^^^^^^^^^^
1212

13-
error: aborting due to previous error
13+
error: aborting due to 1 previous error
1414

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

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

45
// Test that `--extern rustc_middle` fails with `rustc_private`.
56

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
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:6:9
2+
--> $DIR/pathless-extern-unstable.rs:7:9
33
|
44
LL | pub use rustc_middle;
55
| ^^^^^^^^^^^^
66
|
77
= note: see issue #27812 <https://github.com/rust-lang/rust/issues/27812> for more information
88
= help: add `#![feature(rustc_private)]` to the crate attributes to enable
99

10-
error: aborting due to previous error
10+
error: aborting due to 1 previous error
1111

1212
For more information about this error, try `rustc --explain E0658`.

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

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

34
#![feature(rustc_private)]
45
#![crate_type = "lib"]
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error: diagnostic slug and crate name do not match
2-
--> $DIR/enforce_slug_naming.rs:22:8
2+
--> $DIR/enforce_slug_naming.rs:23:8
33
|
44
LL | #[diag(compiletest_example, code = "E0123")]
55
| ^^^^^^^^^^^^^^^^^^^
66
|
77
= note: slug is `compiletest_example` but the crate name is `rustc_dummy`
88
= help: expected a slug starting with `dummy_...`
99

10-
error: aborting due to previous error
10+
error: aborting due to 1 previous error
1111

0 commit comments

Comments
 (0)