Auto merge of #6336 - giraffate:sync-from-rust, r=flip1995

[rust.git] / tests / ui / lint_without_lint_pass.rs

diff --git a/tests/ui/lint_without_lint_pass.rs b/tests/ui/lint_without_lint_pass.rs
index c7e11840a37cc2f55626745dec70b4c31db60342..beaef79a340afad2c371352f2dda86f385c95d8c 100644 (file)
--- a/tests/ui/lint_without_lint_pass.rs
+++ b/tests/ui/lint_without_lint_pass.rs
@@ -1,32 +1,44 @@
 #![deny(clippy::internal)]
-
 #![feature(rustc_private)]
 
 #[macro_use]
-extern crate rustc;
-use rustc::lint;
-
+extern crate rustc_middle;
 #[macro_use]
-extern crate clippy_lints;
+extern crate rustc_session;
+extern crate rustc_lint;
+use rustc_lint::LintPass;
+
+declare_tool_lint! {
+    pub clippy::TEST_LINT,
+    Warn,
+    "",
+    report_in_external_macro: true
+}
 
-declare_clippy_lint! {
-    pub TEST_LINT,
-    correctness,
-    ""
+declare_tool_lint! {
+    pub clippy::TEST_LINT_REGISTERED,
+    Warn,
+    "",
+    report_in_external_macro: true
 }
 
-declare_clippy_lint! {
-    pub TEST_LINT_REGISTERED,
-    correctness,
-    ""
+declare_tool_lint! {
+    pub clippy::TEST_LINT_REGISTERED_ONLY_IMPL,
+    Warn,
+    "",
+    report_in_external_macro: true
 }
 
 pub struct Pass;
-impl lint::LintPass for Pass {
-    fn get_lints(&self) -> lint::LintArray {
-        lint_array!(TEST_LINT_REGISTERED)
+impl LintPass for Pass {
+    fn name(&self) -> &'static str {
+        "TEST_LINT"
     }
 }
 
-fn main() {
-}
+declare_lint_pass!(Pass2 => [TEST_LINT_REGISTERED]);
+
+pub struct Pass3;
+impl_lint_pass!(Pass3 => [TEST_LINT_REGISTERED_ONLY_IMPL]);
+
+fn main() {}