Add the new line to new_lint + fix dogfood

rust-lang · Sep 7, 2024 · a63f367 · a63f367
1 parent 8500ecb
commit a63f367
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/clippy_dev/src/new_lint.rs b/clippy_dev/src/new_lint.rs
@@ -273,6 +273,7 @@ fn get_lint_file_contents(lint: &LintData<'_>, enable_msrv: bool) -> String {
     result.push_str(&if enable_msrv {
         formatdoc!(
             r#"
+            use crate::declare_clippy_lint;
             use clippy_config::msrvs::{{self, Msrv}};
             use clippy_config::Conf;
             {pass_import}
@@ -284,6 +285,7 @@ fn get_lint_file_contents(lint: &LintData<'_>, enable_msrv: bool) -> String {
     } else {
         formatdoc!(
             r#"
+            use crate::declare_clippy_lint;
             {pass_import}
             use rustc_lint::{{{context_import}, {pass_type}}};
             use rustc_session::declare_lint_pass;

diff --git a/clippy_lints/src/declare_clippy_lint.rs b/clippy_lints/src/declare_clippy_lint.rs
@@ -19,7 +19,7 @@ macro_rules! declare_clippy_lint {
             report_in_external_macro:true
         }
 
-        pub(crate) static ${concat($lint_name, _INFO)}: &'static crate::LintInfo = &crate::LintInfo {
+        pub(crate) static ${concat($lint_name, _INFO)}: &'static $crate::LintInfo = &$crate::LintInfo {
             lint: &$lint_name,
             category:  $lintcategory,
             explanation: concat!($($lit,"\n",)*),
@@ -36,7 +36,7 @@ macro_rules! declare_clippy_lint {
     ) => {
         declare_clippy_lint! {@
             $(#[doc = $lit])*
-            pub $lint_name,Allow, crate::LintCategory::Restriction,$desc,
+            pub $lint_name,Allow, $crate::LintCategory::Restriction,$desc,
             declare_clippy_lint!(__version = $version), $version
         }
     };
@@ -49,7 +49,7 @@ macro_rules! declare_clippy_lint {
     ) => {
         declare_clippy_lint! {@
             $(#[doc = $lit])*
-            pub $lint_name, Warn, crate::LintCategory::Style,$desc,
+            pub $lint_name, Warn, $crate::LintCategory::Style,$desc,
             declare_clippy_lint!(__version = $version), $version
 
         }
@@ -63,7 +63,7 @@ macro_rules! declare_clippy_lint {
     ) => {
         declare_clippy_lint! {@
             $(#[doc = $lit])*
-            pub $lint_name,Deny, crate::LintCategory::Correctness,$desc,
+            pub $lint_name,Deny, $crate::LintCategory::Correctness,$desc,
             declare_clippy_lint!(__version = $version), $version
 
         }
@@ -77,7 +77,7 @@ macro_rules! declare_clippy_lint {
     ) => {
         declare_clippy_lint! {@
             $(#[doc = $lit])*
-            pub $lint_name, Warn, crate::LintCategory::Perf,$desc,
+            pub $lint_name, Warn, $crate::LintCategory::Perf,$desc,
                         declare_clippy_lint!(__version = $version), $version
         }
     };
@@ -90,7 +90,7 @@ macro_rules! declare_clippy_lint {
     ) => {
         declare_clippy_lint! {@
             $(#[doc = $lit])*
-                pub $lint_name, Warn, crate::LintCategory::Complexity,$desc,
+                pub $lint_name, Warn, $crate::LintCategory::Complexity,$desc,
                 declare_clippy_lint!(__version = $version), $version
         }
     };
@@ -103,7 +103,7 @@ macro_rules! declare_clippy_lint {
     ) => {
         declare_clippy_lint! {@
             $(#[doc = $lit])*
-                pub $lint_name, Warn, crate::LintCategory::Suspicious,$desc,
+                pub $lint_name, Warn, $crate::LintCategory::Suspicious,$desc,
                 declare_clippy_lint!(__version = $version), $version
         }
     };
@@ -116,7 +116,7 @@ macro_rules! declare_clippy_lint {
     ) => {
         declare_clippy_lint! {@
             $(#[doc = $lit])*
-            pub $lint_name,Allow, crate::LintCategory::Nursery,$desc,
+            pub $lint_name,Allow, $crate::LintCategory::Nursery,$desc,
                         declare_clippy_lint!(__version = $version), $version
         }
     };
@@ -129,7 +129,7 @@ macro_rules! declare_clippy_lint {
     ) => {
         declare_clippy_lint! {@
             $(#[doc = $lit])*
-            pub $lint_name,Allow, crate::LintCategory::Pedantic,$desc,
+            pub $lint_name,Allow, $crate::LintCategory::Pedantic,$desc,
                         declare_clippy_lint!(__version = $version), $version
         }
     };
@@ -142,7 +142,7 @@ macro_rules! declare_clippy_lint {
     ) => {
         declare_clippy_lint! {@
             $(#[doc = $lit])*
-            pub $lint_name,Allow, crate::LintCategory::Cargo,$desc,
+            pub $lint_name,Allow, $crate::LintCategory::Cargo,$desc,
                         declare_clippy_lint!(__version = $version), $version
         }
     };
@@ -156,7 +156,7 @@ macro_rules! declare_clippy_lint {
     ) => {
         declare_clippy_lint! {@
             $(#[doc = $lit])*
-            pub $lint_name,Allow, crate::LintCategory::Internal,$desc,
+            pub $lint_name,Allow, $crate::LintCategory::Internal,$desc,
             declare_clippy_lint!(__version = $($version)?), "0.0.0"
         }
     };

diff --git a/tests/versioncheck.rs b/tests/versioncheck.rs
@@ -24,7 +24,6 @@ fn consistent_clippy_crate_versions() {
     let clippy_version = read_version("Cargo.toml");
 
     let paths = [
-        "declare_clippy_lint/Cargo.toml",
         "clippy_config/Cargo.toml",
         "clippy_lints/Cargo.toml",
         "clippy_utils/Cargo.toml",