Add warning annotations to ignore-stage1 ui-fulldeps tests

13 files changed, 17 insertions, 44 deletions

diff --git a/src/test/ui-fulldeps/issue-15778-pass.rs b/src/test/ui-fulldeps/issue-15778-pass.rs
index 55f19ab4ee3..4b3cf07e283 100644
--- a/src/test/ui-fulldeps/issue-15778-pass.rs
+++ b/src/test/ui-fulldeps/issue-15778-pass.rs
@@ -13,7 +13,7 @@
     rustc_crate_green,
 )]
 
-#![plugin(lint_for_crate_rpass)]
+#![plugin(lint_for_crate_rpass)] //~ WARNING compiler plugins are deprecated
 #![rustc_crate_okay]
 #![rustc_crate_blue]
 #![rustc_crate_red]
diff --git a/src/test/ui-fulldeps/issue-40001.rs b/src/test/ui-fulldeps/issue-40001.rs
index 65e188ed1b6..e0dc3d6a45b 100644
--- a/src/test/ui-fulldeps/issue-40001.rs
+++ b/src/test/ui-fulldeps/issue-40001.rs
@@ -3,7 +3,7 @@
 // ignore-stage1
 
 #![feature(plugin)]
-#![plugin(issue_40001_plugin)]
+#![plugin(issue_40001_plugin)] //~ WARNING compiler plugins are deprecated
 
 #[whitelisted_attr]
 fn main() {}
diff --git a/src/test/ui-fulldeps/lint-plugin-cmdline-allow.rs b/src/test/ui-fulldeps/lint-plugin-cmdline-allow.rs
index 8017379ab3d..1cc16e2fd1c 100644
--- a/src/test/ui-fulldeps/lint-plugin-cmdline-allow.rs
+++ b/src/test/ui-fulldeps/lint-plugin-cmdline-allow.rs
@@ -1,11 +1,10 @@
-// run-pass
+// check-pass
 // aux-build:lint-plugin-test.rs
 // ignore-stage1
 // compile-flags: -A test-lint
 
 #![feature(plugin)]
-#![warn(unused)]
-#![plugin(lint_plugin_test)]
+#![plugin(lint_plugin_test)] //~ WARNING compiler plugins are deprecated
 
 fn lintme() { }
 
diff --git a/src/test/ui-fulldeps/lint-plugin-cmdline-allow.stderr b/src/test/ui-fulldeps/lint-plugin-cmdline-allow.stderr
index 5ab3dfb2449..77265782fa3 100644
--- a/src/test/ui-fulldeps/lint-plugin-cmdline-allow.stderr
+++ b/src/test/ui-fulldeps/lint-plugin-cmdline-allow.stderr
@@ -1,21 +1,8 @@
 warning: use of deprecated attribute `plugin`: compiler plugins are deprecated. See https://github.com/rust-lang/rust/pull/64675
-  --> $DIR/lint-plugin-cmdline-allow.rs:8:1
+  --> $DIR/lint-plugin-cmdline-allow.rs:7:1
    |
 LL | #![plugin(lint_plugin_test)]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: may be removed in a future compiler version
    |
    = note: `#[warn(deprecated)]` on by default
 
-warning: function is never used: `lintme`
-  --> $DIR/lint-plugin-cmdline-allow.rs:10:4
-   |
-LL | fn lintme() { }
-   |    ^^^^^^
-   |
-note: lint level defined here
-  --> $DIR/lint-plugin-cmdline-allow.rs:7:9
-   |
-LL | #![warn(unused)]
-   |         ^^^^^^
-   = note: `#[warn(dead_code)]` implied by `#[warn(unused)]`
-
diff --git a/src/test/ui-fulldeps/lint-tool-cmdline-allow.rs b/src/test/ui-fulldeps/lint-tool-cmdline-allow.rs
index 529f04c6fc4..83a8b3e1a7e 100644
--- a/src/test/ui-fulldeps/lint-tool-cmdline-allow.rs
+++ b/src/test/ui-fulldeps/lint-tool-cmdline-allow.rs
@@ -1,12 +1,12 @@
-// run-pass
+// check-pass
 // aux-build:lint-tool-test.rs
 // ignore-stage1
 // compile-flags: -A test-lint
 
 #![feature(plugin)]
-#![warn(unused)]
-#![plugin(lint_tool_test)]
+#![plugin(lint_tool_test)] //~ WARNING compiler plugins are deprecated
 
 fn lintme() {}
+//~^ WARNING item is named 'lintme' [clippy::test_lint]
 
 pub fn main() {}
diff --git a/src/test/ui-fulldeps/lint-tool-cmdline-allow.stderr b/src/test/ui-fulldeps/lint-tool-cmdline-allow.stderr
index 3a9fd7c2867..825a341c5d3 100644
--- a/src/test/ui-fulldeps/lint-tool-cmdline-allow.stderr
+++ b/src/test/ui-fulldeps/lint-tool-cmdline-allow.stderr
@@ -3,7 +3,7 @@ warning: lint name `test_lint` is deprecated and does not have an effect anymore
    = note: requested on the command line with `-A test_lint`
 
 warning: use of deprecated attribute `plugin`: compiler plugins are deprecated. See https://github.com/rust-lang/rust/pull/64675
-  --> $DIR/lint-tool-cmdline-allow.rs:8:1
+  --> $DIR/lint-tool-cmdline-allow.rs:7:1
    |
 LL | #![plugin(lint_tool_test)]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^ help: may be removed in a future compiler version
@@ -11,23 +11,10 @@ LL | #![plugin(lint_tool_test)]
    = note: `#[warn(deprecated)]` on by default
 
 warning: item is named 'lintme'
-  --> $DIR/lint-tool-cmdline-allow.rs:10:1
+  --> $DIR/lint-tool-cmdline-allow.rs:9:1
    |
 LL | fn lintme() {}
    | ^^^^^^^^^^^^^^
    |
    = note: `#[warn(clippy::test_lint)]` on by default
 
-warning: function is never used: `lintme`
-  --> $DIR/lint-tool-cmdline-allow.rs:10:4
-   |
-LL | fn lintme() {}
-   |    ^^^^^^
-   |
-note: lint level defined here
-  --> $DIR/lint-tool-cmdline-allow.rs:7:9
-   |
-LL | #![warn(unused)]
-   |         ^^^^^^
-   = note: `#[warn(dead_code)]` implied by `#[warn(unused)]`
-
diff --git a/src/test/ui-fulldeps/llvm-pass-plugin.rs b/src/test/ui-fulldeps/llvm-pass-plugin.rs
index a9b53fa8c74..fa5cbc1e808 100644
--- a/src/test/ui-fulldeps/llvm-pass-plugin.rs
+++ b/src/test/ui-fulldeps/llvm-pass-plugin.rs
@@ -3,6 +3,6 @@
 // ignore-stage1
 
 #![feature(plugin)]
-#![plugin(llvm_pass_plugin)]
+#![plugin(llvm_pass_plugin)] //~ WARNING compiler plugins are deprecated
 
 pub fn main() { }
diff --git a/src/test/ui-fulldeps/lto-syntax-extension.rs b/src/test/ui-fulldeps/lto-syntax-extension.rs
index 135861dd772..5964e70f195 100644
--- a/src/test/ui-fulldeps/lto-syntax-extension.rs
+++ b/src/test/ui-fulldeps/lto-syntax-extension.rs
@@ -6,7 +6,7 @@
 // no-prefer-dynamic
 
 #![feature(plugin)]
-#![plugin(lto_syntax_extension_plugin)]
+#![plugin(lto_syntax_extension_plugin)] //~ WARNING compiler plugins are deprecated
 
 extern crate lto_syntax_extension_lib;
 
diff --git a/src/test/ui-fulldeps/outlive-expansion-phase.rs b/src/test/ui-fulldeps/outlive-expansion-phase.rs
index 752f1da7377..fb22888d98a 100644
--- a/src/test/ui-fulldeps/outlive-expansion-phase.rs
+++ b/src/test/ui-fulldeps/outlive-expansion-phase.rs
@@ -3,6 +3,6 @@
 // ignore-stage1
 
 #![feature(plugin)]
-#![plugin(outlive_expansion_phase)]
+#![plugin(outlive_expansion_phase)] //~ WARNING compiler plugins are deprecated
 
 pub fn main() {}
diff --git a/src/test/ui-fulldeps/plugin-args-1.rs b/src/test/ui-fulldeps/plugin-args-1.rs
index d6437146775..739b6e74b8a 100644
--- a/src/test/ui-fulldeps/plugin-args-1.rs
+++ b/src/test/ui-fulldeps/plugin-args-1.rs
@@ -3,7 +3,7 @@
 // ignore-stage1
 
 #![feature(plugin)]
-#![plugin(plugin_args)]
+#![plugin(plugin_args)] //~ WARNING compiler plugins are deprecated
 
 fn main() {
     assert_eq!(plugin_args!(), "");
diff --git a/src/test/ui-fulldeps/plugin-args-2.rs b/src/test/ui-fulldeps/plugin-args-2.rs
index 949f8440379..5c8be3d2f50 100644
--- a/src/test/ui-fulldeps/plugin-args-2.rs
+++ b/src/test/ui-fulldeps/plugin-args-2.rs
@@ -3,7 +3,7 @@
 // ignore-stage1
 
 #![feature(plugin)]
-#![plugin(plugin_args())]
+#![plugin(plugin_args())] //~ WARNING compiler plugins are deprecated
 
 fn main() {
     assert_eq!(plugin_args!(), "");
diff --git a/src/test/ui-fulldeps/plugin-args-3.rs b/src/test/ui-fulldeps/plugin-args-3.rs
index efdbcd0bf0d..2d72bdf0b1b 100644
--- a/src/test/ui-fulldeps/plugin-args-3.rs
+++ b/src/test/ui-fulldeps/plugin-args-3.rs
@@ -3,7 +3,7 @@
 // ignore-stage1
 
 #![feature(plugin)]
-#![plugin(plugin_args(hello(there), how(are="you")))]
+#![plugin(plugin_args(hello(there), how(are="you")))] //~ WARNING compiler plugins are deprecated
 
 fn main() {
     assert_eq!(plugin_args!(), "hello(there), how(are = \"you\")");
diff --git a/src/test/ui-fulldeps/roman-numerals-macro.rs b/src/test/ui-fulldeps/roman-numerals-macro.rs
index 5c4ba3158db..b5823ea3047 100644
--- a/src/test/ui-fulldeps/roman-numerals-macro.rs
+++ b/src/test/ui-fulldeps/roman-numerals-macro.rs
@@ -3,7 +3,7 @@
 // ignore-stage1
 
 #![feature(plugin)]
-#![plugin(roman_numerals)]
+#![plugin(roman_numerals)] //~ WARNING compiler plugins are deprecated
 
 pub fn main() {
     assert_eq!(rn!(MMXV), 2015);