Skip to content

Commit

Permalink
Bless ui-fulldeps
Browse files Browse the repository at this point in the history
We have to ignore some tests in stage1.
  • Loading branch information
Nilstrieb committed Nov 24, 2023
1 parent 9b80d85 commit c73d392
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 11 deletions.
2 changes: 2 additions & 0 deletions tests/ui-fulldeps/dropck-tarena-cycle-checked.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// ignore-stage1

// Reject mixing cyclic structure and Drop when using TypedArena.
//
// (Compare against dropck-vec-cycle-checked.rs)
Expand Down
4 changes: 2 additions & 2 deletions tests/ui-fulldeps/dropck-tarena-cycle-checked.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0597]: `arena` does not live long enough
--> $DIR/dropck-tarena-cycle-checked.rs:116:7
--> $DIR/dropck-tarena-cycle-checked.rs:118:7
|
LL | let arena = TypedArena::default();
| ----- binding `arena` declared here
Expand All @@ -11,6 +11,6 @@ LL | }
| `arena` dropped here while still borrowed
| borrow might be used here, when `arena` is dropped and runs the `Drop` code for type `TypedArena`

error: aborting due to previous error
error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0597`.
2 changes: 2 additions & 0 deletions tests/ui-fulldeps/dropck-tarena-unsound-drop.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// ignore-stage1

// Check that an arena (TypedArena) cannot carry elements whose drop
// methods might access borrowed data of lifetime that does not
// strictly outlive the arena itself.
Expand Down
4 changes: 2 additions & 2 deletions tests/ui-fulldeps/dropck-tarena-unsound-drop.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0597]: `arena` does not live long enough
--> $DIR/dropck-tarena-unsound-drop.rs:41:7
--> $DIR/dropck-tarena-unsound-drop.rs:43:7
|
LL | let arena: TypedArena<C> = TypedArena::default();
| ----- binding `arena` declared here
Expand All @@ -11,6 +11,6 @@ LL | }
| `arena` dropped here while still borrowed
| borrow might be used here, when `arena` is dropped and runs the `Drop` code for type `TypedArena`

error: aborting due to previous error
error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0597`.
1 change: 1 addition & 0 deletions tests/ui-fulldeps/internal-lints/span_use_eq_ctxt.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// Test the `rustc::span_use_eq_ctxt` internal lint
// compile-flags: -Z unstable-options
// ignore-stage1

#![feature(rustc_private)]
#![deny(rustc::span_use_eq_ctxt)]
Expand Down
6 changes: 3 additions & 3 deletions tests/ui-fulldeps/internal-lints/span_use_eq_ctxt.stderr
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
error: use `.eq_ctxt()` instead of `.ctxt() == .ctxt()`
--> $DIR/span_use_eq_ctxt.rs:12:5
--> $DIR/span_use_eq_ctxt.rs:13:5
|
LL | s.ctxt() == t.ctxt()
| ^^^^^^^^^^^^^^^^^^^^
|
note: the lint level is defined here
--> $DIR/span_use_eq_ctxt.rs:5:9
--> $DIR/span_use_eq_ctxt.rs:6:9
|
LL | #![deny(rustc::span_use_eq_ctxt)]
| ^^^^^^^^^^^^^^^^^^^^^^^

error: aborting due to previous error
error: aborting due to 1 previous error

1 change: 1 addition & 0 deletions tests/ui-fulldeps/pathless-extern-unstable.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// edition:2018
// compile-flags:--extern rustc_middle
// ignore-stage1

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

Expand Down
4 changes: 2 additions & 2 deletions tests/ui-fulldeps/pathless-extern-unstable.stderr
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
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?
--> $DIR/pathless-extern-unstable.rs:6:9
--> $DIR/pathless-extern-unstable.rs:7:9
|
LL | pub use rustc_middle;
| ^^^^^^^^^^^^
|
= note: see issue #27812 <https://github.com/rust-lang/rust/issues/27812> for more information
= help: add `#![feature(rustc_private)]` to the crate attributes to enable

error: aborting due to previous error
error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0658`.
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// rustc-env:CARGO_CRATE_NAME=rustc_dummy
// ignore-stage1

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

error: aborting due to previous error
error: aborting due to 1 previous error

0 comments on commit c73d392

Please sign in to comment.