Skip to content

Commit a9dc6a6

Browse files
Rollup merge of #99298 - ChrisDenton:ignore-plugins-stage1, r=Mark-Simulacrum
Make `ui-fulldeps/gated-plugins` and `ui-fulldeps/multiple-plugins` tests stage 2 only These test can fail on stage 1. Fixes #99295
2 parents 0e7c843 + f822c3d commit a9dc6a6

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

src/test/ui-fulldeps/gated-plugin.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// aux-build:empty-plugin.rs
2+
// ignore-stage1
23

34
#![plugin(empty_plugin)]
45
//~^ ERROR compiler plugins are deprecated

src/test/ui-fulldeps/gated-plugin.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0658]: compiler plugins are deprecated
2-
--> $DIR/gated-plugin.rs:3:1
2+
--> $DIR/gated-plugin.rs:4:1
33
|
44
LL | #![plugin(empty_plugin)]
55
| ^^^^^^^^^^^^^^^^^^^^^^^^
@@ -8,7 +8,7 @@ LL | #![plugin(empty_plugin)]
88
= help: add `#![feature(plugin)]` to the crate attributes to enable
99

1010
warning: use of deprecated attribute `plugin`: compiler plugins are deprecated. See https://github.com/rust-lang/rust/pull/64675
11-
--> $DIR/gated-plugin.rs:3:1
11+
--> $DIR/gated-plugin.rs:4:1
1212
|
1313
LL | #![plugin(empty_plugin)]
1414
| ^^^^^^^^^^^^^^^^^^^^^^^^ help: may be removed in a future compiler version

src/test/ui-fulldeps/multiple-plugins.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// run-pass
22
// aux-build:multiple-plugins-1.rs
33
// aux-build:multiple-plugins-2.rs
4+
// ignore-stage1
45

56
// Check that the plugin registrar of multiple plugins doesn't conflict
67

src/test/ui-fulldeps/multiple-plugins.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
warning: use of deprecated attribute `plugin`: compiler plugins are deprecated. See https://github.com/rust-lang/rust/pull/64675
2-
--> $DIR/multiple-plugins.rs:8:1
2+
--> $DIR/multiple-plugins.rs:9:1
33
|
44
LL | #![plugin(multiple_plugins_1)]
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: may be removed in a future compiler version
66
|
77
= note: `#[warn(deprecated)]` on by default
88

99
warning: use of deprecated attribute `plugin`: compiler plugins are deprecated. See https://github.com/rust-lang/rust/pull/64675
10-
--> $DIR/multiple-plugins.rs:9:1
10+
--> $DIR/multiple-plugins.rs:10:1
1111
|
1212
LL | #![plugin(multiple_plugins_2)]
1313
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: may be removed in a future compiler version

0 commit comments

Comments
 (0)