diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2022-07-23 23:34:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-23 23:34:28 +0200 |
| commit | a9dc6a64314333c8ad094ecce296b28c66d850a3 (patch) | |
| tree | 90d478a5a54df1e2d60a1571d7afa4a2941dc61f /src | |
| parent | 0e7c843da4b7628b8becd96970f22b57dd400ace (diff) | |
| parent | f822c3d6ec1a850456aed9ceb9effe0bc4a097d4 (diff) | |
| download | rust-a9dc6a64314333c8ad094ecce296b28c66d850a3.tar.gz rust-a9dc6a64314333c8ad094ecce296b28c66d850a3.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/ui-fulldeps/gated-plugin.rs | 1 | ||||
| -rw-r--r-- | src/test/ui-fulldeps/gated-plugin.stderr | 4 | ||||
| -rw-r--r-- | src/test/ui-fulldeps/multiple-plugins.rs | 1 | ||||
| -rw-r--r-- | src/test/ui-fulldeps/multiple-plugins.stderr | 4 |
4 files changed, 6 insertions, 4 deletions
diff --git a/src/test/ui-fulldeps/gated-plugin.rs b/src/test/ui-fulldeps/gated-plugin.rs index 445469f8733..85eaf533643 100644 --- a/src/test/ui-fulldeps/gated-plugin.rs +++ b/src/test/ui-fulldeps/gated-plugin.rs @@ -1,4 +1,5 @@ // aux-build:empty-plugin.rs +// ignore-stage1 #![plugin(empty_plugin)] //~^ ERROR compiler plugins are deprecated diff --git a/src/test/ui-fulldeps/gated-plugin.stderr b/src/test/ui-fulldeps/gated-plugin.stderr index b8b7dd23c1c..f48f1eab60b 100644 --- a/src/test/ui-fulldeps/gated-plugin.stderr +++ b/src/test/ui-fulldeps/gated-plugin.stderr @@ -1,5 +1,5 @@ error[E0658]: compiler plugins are deprecated - --> $DIR/gated-plugin.rs:3:1 + --> $DIR/gated-plugin.rs:4:1 | LL | #![plugin(empty_plugin)] | ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -8,7 +8,7 @@ LL | #![plugin(empty_plugin)] = help: add `#![feature(plugin)]` to the crate attributes to enable warning: use of deprecated attribute `plugin`: compiler plugins are deprecated. See https://github.com/rust-lang/rust/pull/64675 - --> $DIR/gated-plugin.rs:3:1 + --> $DIR/gated-plugin.rs:4:1 | LL | #![plugin(empty_plugin)] | ^^^^^^^^^^^^^^^^^^^^^^^^ help: may be removed in a future compiler version diff --git a/src/test/ui-fulldeps/multiple-plugins.rs b/src/test/ui-fulldeps/multiple-plugins.rs index 25d2c8bc123..9af3ebd570c 100644 --- a/src/test/ui-fulldeps/multiple-plugins.rs +++ b/src/test/ui-fulldeps/multiple-plugins.rs @@ -1,6 +1,7 @@ // run-pass // aux-build:multiple-plugins-1.rs // aux-build:multiple-plugins-2.rs +// ignore-stage1 // Check that the plugin registrar of multiple plugins doesn't conflict diff --git a/src/test/ui-fulldeps/multiple-plugins.stderr b/src/test/ui-fulldeps/multiple-plugins.stderr index 99151933c4b..878ffabfc7f 100644 --- a/src/test/ui-fulldeps/multiple-plugins.stderr +++ b/src/test/ui-fulldeps/multiple-plugins.stderr @@ -1,5 +1,5 @@ warning: use of deprecated attribute `plugin`: compiler plugins are deprecated. See https://github.com/rust-lang/rust/pull/64675 - --> $DIR/multiple-plugins.rs:8:1 + --> $DIR/multiple-plugins.rs:9:1 | LL | #![plugin(multiple_plugins_1)] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: may be removed in a future compiler version @@ -7,7 +7,7 @@ LL | #![plugin(multiple_plugins_1)] = note: `#[warn(deprecated)]` on by default warning: use of deprecated attribute `plugin`: compiler plugins are deprecated. See https://github.com/rust-lang/rust/pull/64675 - --> $DIR/multiple-plugins.rs:9:1 + --> $DIR/multiple-plugins.rs:10:1 | LL | #![plugin(multiple_plugins_2)] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: may be removed in a future compiler version |