rename to excessive_nesting and remove excessive_width completely

Author: Centri3

CHANGELOG.md

@@ -4630,7 +4630,7 @@ Released 2018-09-13
 [`erasing_op`]: https://rust-lang.github.io/rust-clippy/master/index.html#erasing_op
 [`err_expect`]: https://rust-lang.github.io/rust-clippy/master/index.html#err_expect
 [`eval_order_dependence`]: https://rust-lang.github.io/rust-clippy/master/index.html#eval_order_dependence
-[`excessive_indentation`]: https://rust-lang.github.io/rust-clippy/master/index.html#excessive_indentation
+[`excessive_nesting`]: https://rust-lang.github.io/rust-clippy/master/index.html#excessive_nesting
 [`excessive_precision`]: https://rust-lang.github.io/rust-clippy/master/index.html#excessive_precision
 [`exhaustive_enums`]: https://rust-lang.github.io/rust-clippy/master/index.html#exhaustive_enums
 [`exhaustive_structs`]: https://rust-lang.github.io/rust-clippy/master/index.html#exhaustive_structs

clippy_lints/src/declared_lints.rs

@@ -154,7 +154,7 @@ pub(crate) static LINTS: &[&crate::LintInfo] = &[
     crate::eta_reduction::REDUNDANT_CLOSURE_FOR_METHOD_CALLS_INFO,
     crate::excessive_bools::FN_PARAMS_EXCESSIVE_BOOLS_INFO,
     crate::excessive_bools::STRUCT_EXCESSIVE_BOOLS_INFO,
-    crate::excessive_indentation::EXCESSIVE_INDENTATION_INFO,
+    crate::excessive_nesting::EXCESSIVE_NESTING_INFO,
     crate::exhaustive_items::EXHAUSTIVE_ENUMS_INFO,
     crate::exhaustive_items::EXHAUSTIVE_STRUCTS_INFO,
     crate::exit::EXIT_INFO,

clippy_lints/src/excessive_indentation.rs renamed to clippy_lints/src/excessive_nesting.rs

@@ -16,7 +16,7 @@ use thin_vec::ThinVec;
 declare_clippy_lint! {
     /// ### What it does
     ///
-    /// Checks for lines which are indented beyond a certain threshold.
+    /// Checks for blocks which are indented beyond a certain threshold.
     ///
     /// ### Why is this bad?
     ///
@@ -28,45 +28,43 @@ declare_clippy_lint! {
     /// Use instead:
     /// TODO
     #[clippy::version = "1.70.0"]
-    pub EXCESSIVE_INDENTATION,
+    pub EXCESSIVE_NESTING,
     nursery,
-    "checks for lines indented beyond a certain threshold"
+    "checks for blocks nested beyond a certain threshold"
 }
-impl_lint_pass!(ExcessiveIndentation => [EXCESSIVE_INDENTATION]);
+impl_lint_pass!(ExcessiveNesting => [EXCESSIVE_NESTING]);
 
 #[derive(Clone, Copy)]
-pub struct ExcessiveIndentation {
-    pub excessive_width_threshold: u64,
-    pub excessive_width_ignore_indentation: bool,
-    pub excessive_indentation_threshold: u64,
+pub struct ExcessiveNesting {
+    pub excessive_nesting_threshold: u64,
 }
 
-impl EarlyLintPass for ExcessiveIndentation {
+impl EarlyLintPass for ExcessiveNesting {
     fn check_item(&mut self, cx: &EarlyContext<'_>, item: &Item) {
-        IndentationVisitor { indent: 0 }.visit_item(item);
+        NestingVisitor { indent: 0 }.visit_item(item);
     }
 }
 
 /// RAII guard to add 1 to our indent counter when constructed, and remove 1 when dropped.
-struct IndentationGuard<'i>(&'i mut u64);
+struct NestingGuard<'i>(&'i mut u64);
 
-impl<'i> IndentationGuard<'i> {
+impl<'i> NestingGuard<'i> {
     fn new(indent: &'i mut u64) -> Self {
         Self(indent)
     }
 }
 
-impl<'i> Drop for IndentationGuard<'i> {
+impl<'i> Drop for NestingGuard<'i> {
     fn drop(&mut self) {
         *self.0 -= 1;
     }
 }
 
-struct IndentationVisitor {
+struct NestingVisitor {
     indent: u64,
 }
 
-impl Visitor<'_> for IndentationVisitor {
+impl Visitor<'_> for NestingVisitor {
     fn visit_foreign_item(&mut self, item: &ForeignItem) {
         match &item.kind {
             ForeignItemKind::Static(.., expr) => {
@@ -80,7 +78,7 @@ impl Visitor<'_> for IndentationVisitor {
     }
 
     fn visit_block(&mut self, block: &Block) {
-        IndentationGuard::new(&mut self.indent);
+        NestingGuard::new(&mut self.indent);
 
         todo!();
     }
@@ -122,7 +120,7 @@ impl Visitor<'_> for IndentationVisitor {
     }
 
     fn visit_fn(&mut self, fk: FnKind<'_>, _: Span, _: NodeId) {
-        IndentationGuard::new(&mut self.indent);
+        NestingGuard::new(&mut self.indent);
 
         match fk {
             FnKind::Fn(.., block) if let Some(block) = block => self.visit_block(block),
@@ -134,7 +132,7 @@ impl Visitor<'_> for IndentationVisitor {
     fn visit_use_tree(&mut self, use_tree: &UseTree, _: NodeId, _: bool) {
         // TODO: I don't think this should be linted, as some devious crate may decide to put some type
         // nested within 10 modules. Maybe it can be optional using config?
-        IndentationGuard::new(&mut self.indent);
+        NestingGuard::new(&mut self.indent);
 
         if let UseTreeKind::Nested(use_trees) = &use_tree.kind {
             for use_tree in use_trees {

clippy_lints/src/lib.rs

@@ -120,7 +120,7 @@ mod equatable_if_let;
 mod escape;
 mod eta_reduction;
 mod excessive_bools;
-mod excessive_indentation;
+mod excessive_nesting;
 mod exhaustive_items;
 mod exit;
 mod explicit_write;
@@ -963,14 +963,10 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
     store.register_late_pass(|_| Box::new(tests_outside_test_module::TestsOutsideTestModule));
     store.register_late_pass(|_| Box::new(manual_slice_size_calculation::ManualSliceSizeCalculation));
     store.register_early_pass(|| Box::new(suspicious_doc_comments::SuspiciousDocComments));
-    let excessive_width_threshold = conf.excessive_width_threshold;
-    let excessive_width_ignore_indentation = conf.excessive_width_ignore_indentation;
-    let excessive_indentation_threshold = conf.excessive_indentation_threshold;
-    store.register_late_pass(move |_| {
-        Box::new(excessive_indentation::ExcessiveIndentation {
-            excessive_width_threshold,
-            excessive_width_ignore_indentation,
-            excessive_indentation_threshold,
+    let excessive_nesting_threshold = conf.excessive_nesting_threshold;
+    store.register_early_pass(move || {
+        Box::new(excessive_nesting::ExcessiveNesting {
+            excessive_nesting_threshold,
         })
     });
     store.register_late_pass(|_| Box::new(items_after_test_module::ItemsAfterTestModule));

clippy_lints/src/utils/conf.rs

@@ -266,18 +266,10 @@ define_Conf! {
     ///
     /// The maximum cognitive complexity a function can have
     (cognitive_complexity_threshold: u64 = 25),
-    /// Lint: EXCESSIVE_WIDTH.
+    /// Lint: EXCESSIVE_NESTING.
     ///
-    /// The maximum width a statement can have
-    (excessive_width_threshold: u64 = 100),
-    /// Lint: EXCESSIVE_WIDTH.
-    ///
-    /// Whether to ignore the line's indentation
-    (excessive_width_ignore_indentation: bool = true),
-    /// Lint: EXCESSIVE_INDENTATION.
-    ///
-    /// The maximum indentation a statement can have
-    (excessive_indentation_threshold: u64 = 10),
+    /// The maximum amount of nesting a block can reside in
+    (excessive_nesting_threshold: u64 = 10),
     /// DEPRECATED LINT: CYCLOMATIC_COMPLEXITY.
     ///
     /// Use the Cognitive Complexity lint instead.

tests/ui-toml/excessive_nesting/clippy.toml

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