work with lint attributes

Author: Centri3

clippy_lints/src/excessive_nesting.rs

@@ -1,7 +1,8 @@
 use clippy_utils::diagnostics::span_lint_and_help;
 use rustc_ast::{
+    node_id::NodeSet,
     visit::{walk_block, walk_item, Visitor},
-    Block, Crate, Inline, Item, ItemKind, ModKind,
+    Block, Crate, Inline, Item, ItemKind, ModKind, NodeId,
 };
 use rustc_lint::{EarlyContext, EarlyLintPass, LintContext};
 use rustc_middle::lint::in_external_macro;
@@ -52,23 +53,42 @@ declare_clippy_lint! {
     ///     }
     /// }
     /// ```
+    /// lib.rs:
+    /// ```rust,ignore
+    /// pub mod a;
+    /// ```
     #[clippy::version = "1.70.0"]
     pub EXCESSIVE_NESTING,
     restriction,
     "checks for blocks nested beyond a certain threshold"
 }
 impl_lint_pass!(ExcessiveNesting => [EXCESSIVE_NESTING]);
 
-#[derive(Clone, Copy)]
+#[derive(Clone)]
 pub struct ExcessiveNesting {
     pub excessive_nesting_threshold: u64,
+    pub nodes: NodeSet,
+}
+
+impl ExcessiveNesting {
+    pub fn check_node_id(&self, cx: &EarlyContext<'_>, span: Span, node_id: NodeId) {
+        if self.nodes.contains(&node_id) {
+            span_lint_and_help(
+                cx,
+                EXCESSIVE_NESTING,
+                span,
+                "this block is too nested",
+                None,
+                "try refactoring your code to minimize nesting",
+            );
+        }
+    }
 }
 
 impl EarlyLintPass for ExcessiveNesting {
     fn check_crate(&mut self, cx: &EarlyContext<'_>, krate: &Crate) {
-        let conf = self;
         let mut visitor = NestingVisitor {
-            conf,
+            conf: self,
             cx,
             nest_level: 0,
         };
@@ -77,25 +97,26 @@ impl EarlyLintPass for ExcessiveNesting {
             visitor.visit_item(item);
         }
     }
+
+    fn check_block(&mut self, cx: &EarlyContext<'_>, block: &Block) {
+        self.check_node_id(cx, block.span, block.id);
+    }
+
+    fn check_item(&mut self, cx: &EarlyContext<'_>, item: &Item) {
+        self.check_node_id(cx, item.span, item.id);
+    }
 }
 
 struct NestingVisitor<'conf, 'cx> {
-    conf: &'conf ExcessiveNesting,
+    conf: &'conf mut ExcessiveNesting,
     cx: &'cx EarlyContext<'cx>,
     nest_level: u64,
 }
 
 impl NestingVisitor<'_, '_> {
-    fn check_indent(&self, span: Span) -> bool {
+    fn check_indent(&mut self, span: Span, id: NodeId) -> bool {
         if self.nest_level > self.conf.excessive_nesting_threshold && !in_external_macro(self.cx.sess(), span) {
-            span_lint_and_help(
-                self.cx,
-                EXCESSIVE_NESTING,
-                span,
-                "this block is too nested",
-                None,
-                "try refactoring your code to minimize nesting",
-            );
+            self.conf.nodes.insert(id);
 
             return true;
         }
@@ -106,14 +127,13 @@ impl NestingVisitor<'_, '_> {
 
 impl<'conf, 'cx> Visitor<'_> for NestingVisitor<'conf, 'cx> {
     fn visit_block(&mut self, block: &Block) {
-        // TODO: Probably not necessary, since any block would already be ignored by the check in visit_item
         if block.span.from_expansion() {
             return;
         }
 
         self.nest_level += 1;
 
-        if !self.check_indent(block.span) {
+        if !self.check_indent(block.span, block.id) {
             walk_block(self, block);
         }
 
@@ -129,7 +149,7 @@ impl<'conf, 'cx> Visitor<'_> for NestingVisitor<'conf, 'cx> {
             ItemKind::Trait(_) | ItemKind::Impl(_) | ItemKind::Mod(.., ModKind::Loaded(_, Inline::Yes, _)) => {
                 self.nest_level += 1;
 
-                if !self.check_indent(item.span) {
+                if !self.check_indent(item.span, item.id) {
                     walk_item(self, item);
                 }
 

clippy_lints/src/lib.rs

@@ -1012,6 +1012,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
     store.register_early_pass(move || {
         Box::new(excessive_nesting::ExcessiveNesting {
             excessive_nesting_threshold,
+            nodes: rustc_ast::node_id::NodeSet::new(),
         })
     });
     store.register_late_pass(|_| Box::new(items_after_test_module::ItemsAfterTestModule));

tests/ui-toml/excessive_nesting/clippy.toml renamed to tests/ui-toml/excessive_nesting/below/clippy.toml

@@ -0,0 +1 @@
+excessive-nesting-threshold = 10