-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Add excessive_nesting
lint
#10672
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Add excessive_nesting
lint
#10672
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
97c1007
add the `excessive_*` style lints
Centri3 4af3ac1
change it to nursery category
Centri3 e68dbc3
add `excessive_nesting`
Centri3 a9da61b
couple more notes
Centri3 88143ac
decided against reinventing the wheel
Centri3 493a23e
check non-inline modules, ignore all macros
Centri3 378d775
work with lint attributes
Centri3 725399a
move to `complexity` but don't lint by default
Centri3 5da3455
Check if from proc macro and better tests
Centri3 6afb355
remove revisions
Centri3 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,180 @@ | ||
use clippy_utils::{diagnostics::span_lint_and_help, source::snippet}; | ||
use rustc_ast::{ | ||
node_id::NodeSet, | ||
visit::{walk_block, walk_item, Visitor}, | ||
Block, Crate, Inline, Item, ItemKind, ModKind, NodeId, | ||
}; | ||
use rustc_lint::{EarlyContext, EarlyLintPass, LintContext}; | ||
use rustc_middle::lint::in_external_macro; | ||
use rustc_session::{declare_tool_lint, impl_lint_pass}; | ||
use rustc_span::Span; | ||
|
||
declare_clippy_lint! { | ||
/// ### What it does | ||
/// Checks for blocks which are nested beyond a certain threshold. | ||
/// | ||
/// Note: Even though this lint is warn-by-default, it will only trigger if a maximum nesting level is defined in the clippy.toml file. | ||
/// | ||
/// ### Why is this bad? | ||
/// It can severely hinder readability. | ||
/// | ||
/// ### Example | ||
/// An example clippy.toml configuration: | ||
/// ```toml | ||
/// # clippy.toml | ||
/// excessive-nesting-threshold = 3 | ||
/// ``` | ||
/// lib.rs: | ||
/// ```rust,ignore | ||
/// pub mod a { | ||
/// pub struct X; | ||
/// impl X { | ||
/// pub fn run(&self) { | ||
/// if true { | ||
/// // etc... | ||
/// } | ||
/// } | ||
/// } | ||
/// } | ||
/// Use instead: | ||
/// a.rs: | ||
/// ```rust,ignore | ||
/// fn private_run(x: &X) { | ||
/// if true { | ||
/// // etc... | ||
/// } | ||
/// } | ||
/// | ||
/// pub struct X; | ||
/// impl X { | ||
/// pub fn run(&self) { | ||
/// private_run(self); | ||
/// } | ||
/// } | ||
/// ``` | ||
/// lib.rs: | ||
/// ```rust,ignore | ||
/// pub mod a; | ||
/// ``` | ||
#[clippy::version = "1.70.0"] | ||
pub EXCESSIVE_NESTING, | ||
complexity, | ||
"checks for blocks nested beyond a certain threshold" | ||
} | ||
impl_lint_pass!(ExcessiveNesting => [EXCESSIVE_NESTING]); | ||
|
||
#[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) { | ||
if self.excessive_nesting_threshold == 0 { | ||
return; | ||
} | ||
|
||
let mut visitor = NestingVisitor { | ||
conf: self, | ||
cx, | ||
nest_level: 0, | ||
}; | ||
|
||
for item in &krate.items { | ||
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 mut ExcessiveNesting, | ||
cx: &'cx EarlyContext<'cx>, | ||
nest_level: u64, | ||
} | ||
|
||
impl NestingVisitor<'_, '_> { | ||
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) { | ||
self.conf.nodes.insert(id); | ||
|
||
return true; | ||
} | ||
|
||
false | ||
} | ||
} | ||
|
||
impl<'conf, 'cx> Visitor<'_> for NestingVisitor<'conf, 'cx> { | ||
fn visit_block(&mut self, block: &Block) { | ||
if block.span.from_expansion() { | ||
return; | ||
} | ||
|
||
// TODO: This should be rewritten using `LateLintPass` so we can use `is_from_proc_macro` instead, | ||
// but for now, this is fine. | ||
let snippet = snippet(self.cx, block.span, "{}").trim().to_owned(); | ||
if !snippet.starts_with('{') || !snippet.ends_with('}') { | ||
return; | ||
} | ||
|
||
self.nest_level += 1; | ||
Centri3 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
if !self.check_indent(block.span, block.id) { | ||
walk_block(self, block); | ||
} | ||
|
||
self.nest_level -= 1; | ||
} | ||
|
||
fn visit_item(&mut self, item: &Item) { | ||
if item.span.from_expansion() { | ||
return; | ||
} | ||
|
||
match &item.kind { | ||
ItemKind::Trait(_) | ItemKind::Impl(_) | ItemKind::Mod(.., ModKind::Loaded(_, Inline::Yes, _)) => { | ||
self.nest_level += 1; | ||
|
||
if !self.check_indent(item.span, item.id) { | ||
walk_item(self, item); | ||
} | ||
|
||
self.nest_level -= 1; | ||
}, | ||
// Reset nesting level for non-inline modules (since these are in another file) | ||
ItemKind::Mod(..) => walk_item( | ||
&mut NestingVisitor { | ||
conf: self.conf, | ||
cx: self.cx, | ||
nest_level: 0, | ||
}, | ||
item, | ||
), | ||
_ => walk_item(self, item), | ||
} | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.