Add parenthesis where necessary in end of range

rspencer01 · rspencer01 · commit 0d4912bdfa96 · 2024-08-26T12:04:14.000+01:00
diff --git a/clippy_lints/src/methods/map_with_unused_argument_over_ranges.rs b/clippy_lints/src/methods/map_with_unused_argument_over_ranges.rs
@@ -2,6 +2,7 @@ use crate::methods::MAP_WITH_UNUSED_ARGUMENT_OVER_RANGES;
 use clippy_config::msrvs::{self, Msrv};
 use clippy_utils::diagnostics::span_lint_and_then;
 use clippy_utils::source::snippet_with_applicability;
+use clippy_utils::sugg::Sugg;
 use clippy_utils::{eager_or_lazy, higher, usage};
 use rustc_ast::ast::RangeLimits;
 use rustc_ast::LitKind;
@@ -39,7 +40,9 @@ fn extract_count_with_applicability(
             };
             return Some(format!("{count}"));
         }
-        let end_snippet = snippet_with_applicability(cx, end.span, "...", applicability).into_owned();
+        let end_snippet = Sugg::hir_with_applicability(cx, end, "...", applicability)
+            .maybe_par()
+            .into_string();
         if lower_bound == 0 {
             if range.limits == RangeLimits::Closed {
                 return Some(format!("{end_snippet} + 1"));
diff --git a/tests/ui/map_with_unused_argument_over_ranges.fixed b/tests/ui/map_with_unused_argument_over_ranges.fixed
@@ -1,4 +1,9 @@
-#![allow(unused, clippy::redundant_closure, clippy::reversed_empty_ranges)]
+#![allow(
+    unused,
+    clippy::redundant_closure,
+    clippy::reversed_empty_ranges,
+    clippy::identity_op
+)]
 #![warn(clippy::map_with_unused_argument_over_ranges)]
 
 fn do_something() -> usize {
@@ -38,6 +43,7 @@ fn main() {
     (-3..9).map(|_| do_something());
     std::iter::repeat_with(|| do_something()).take(0);
     std::iter::repeat_with(|| do_something()).take(1);
+    std::iter::repeat_with(|| do_something()).take((1 << 4) - 0);
     // These should not be raised
     gen!();
     let lower = 2;
diff --git a/tests/ui/map_with_unused_argument_over_ranges.rs b/tests/ui/map_with_unused_argument_over_ranges.rs
@@ -1,4 +1,9 @@
-#![allow(unused, clippy::redundant_closure, clippy::reversed_empty_ranges)]
+#![allow(
+    unused,
+    clippy::redundant_closure,
+    clippy::reversed_empty_ranges,
+    clippy::identity_op
+)]
 #![warn(clippy::map_with_unused_argument_over_ranges)]
 
 fn do_something() -> usize {
@@ -38,6 +43,7 @@ fn main() {
     (-3..9).map(|_| do_something());
     (9..3).map(|_| do_something());
     (9..=9).map(|_| do_something());
+    (1..=1 << 4).map(|_| do_something());
     // These should not be raised
     gen!();
     let lower = 2;
diff --git a/tests/ui/map_with_unused_argument_over_ranges.stderr b/tests/ui/map_with_unused_argument_over_ranges.stderr
@@ -1,5 +1,5 @@
 error: map of a closure that does not depend on its parameter over a range
-  --> tests/ui/map_with_unused_argument_over_ranges.rs:20:5
+  --> tests/ui/map_with_unused_argument_over_ranges.rs:25:5
    |
 LL |     (0..10).map(|_| do_something());
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -13,7 +13,7 @@ LL +     std::iter::repeat_with(|| do_something()).take(10);
    |
 
 error: map of a closure that does not depend on its parameter over a range
-  --> tests/ui/map_with_unused_argument_over_ranges.rs:21:5
+  --> tests/ui/map_with_unused_argument_over_ranges.rs:26:5
    |
 LL |     (0..10).map(|_foo| do_something());
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -25,7 +25,7 @@ LL +     std::iter::repeat_with(|| do_something()).take(10);
    |
 
 error: map of a closure that does not depend on its parameter over a range
-  --> tests/ui/map_with_unused_argument_over_ranges.rs:22:5
+  --> tests/ui/map_with_unused_argument_over_ranges.rs:27:5
    |
 LL |     (0..=10).map(|_| do_something());
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -37,7 +37,7 @@ LL +     std::iter::repeat_with(|| do_something()).take(11);
    |
 
 error: map of a closure that does not depend on its parameter over a range
-  --> tests/ui/map_with_unused_argument_over_ranges.rs:23:5
+  --> tests/ui/map_with_unused_argument_over_ranges.rs:28:5
    |
 LL |     (3..10).map(|_| do_something());
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -49,7 +49,7 @@ LL +     std::iter::repeat_with(|| do_something()).take(7);
    |
 
 error: map of a closure that does not depend on its parameter over a range
-  --> tests/ui/map_with_unused_argument_over_ranges.rs:24:5
+  --> tests/ui/map_with_unused_argument_over_ranges.rs:29:5
    |
 LL |     (3..=10).map(|_| do_something());
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -61,7 +61,7 @@ LL +     std::iter::repeat_with(|| do_something()).take(8);
    |
 
 error: map of a closure that does not depend on its parameter over a range
-  --> tests/ui/map_with_unused_argument_over_ranges.rs:25:5
+  --> tests/ui/map_with_unused_argument_over_ranges.rs:30:5
    |
 LL |     (0..10).map(|_| 3);
    |     ^^^^^^^^^^^^^^^^^^
@@ -72,7 +72,7 @@ LL |     std::iter::repeat(3).take(10);
    |     ~~~~~~~~~~~~~~~~~ ~ +++++++++
 
 error: map of a closure that does not depend on its parameter over a range
-  --> tests/ui/map_with_unused_argument_over_ranges.rs:26:5
+  --> tests/ui/map_with_unused_argument_over_ranges.rs:31:5
    |
 LL | /     (0..10).map(|_| {
 LL | |         let x = 3;
@@ -89,7 +89,7 @@ LL ~     }).take(10);
    |
 
 error: map of a closure that does not depend on its parameter over a range
-  --> tests/ui/map_with_unused_argument_over_ranges.rs:30:5
+  --> tests/ui/map_with_unused_argument_over_ranges.rs:35:5
    |
 LL |     (0..10).map(|_| do_something()).collect::<Vec<_>>();
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -101,7 +101,7 @@ LL +     std::iter::repeat_with(|| do_something()).take(10).collect::<Vec<_>>();
    |
 
 error: map of a closure that does not depend on its parameter over a range
-  --> tests/ui/map_with_unused_argument_over_ranges.rs:32:5
+  --> tests/ui/map_with_unused_argument_over_ranges.rs:37:5
    |
 LL |     (0..upper).map(|_| do_something());
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -113,7 +113,7 @@ LL +     std::iter::repeat_with(|| do_something()).take(upper);
    |
 
 error: map of a closure that does not depend on its parameter over a range
-  --> tests/ui/map_with_unused_argument_over_ranges.rs:34:5
+  --> tests/ui/map_with_unused_argument_over_ranges.rs:39:5
    |
 LL |     (0..upper_fn()).map(|_| do_something());
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -125,7 +125,7 @@ LL +     std::iter::repeat_with(|| do_something()).take(upper_fn());
    |
 
 error: map of a closure that does not depend on its parameter over a range
-  --> tests/ui/map_with_unused_argument_over_ranges.rs:35:5
+  --> tests/ui/map_with_unused_argument_over_ranges.rs:40:5
    |
 LL |     (0..=upper_fn()).map(|_| do_something());
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -137,7 +137,7 @@ LL +     std::iter::repeat_with(|| do_something()).take(upper_fn() + 1);
    |
 
 error: map of a closure that does not depend on its parameter over a range
-  --> tests/ui/map_with_unused_argument_over_ranges.rs:36:5
+  --> tests/ui/map_with_unused_argument_over_ranges.rs:41:5
    |
 LL |     (2..upper_fn()).map(|_| do_something());
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -149,7 +149,7 @@ LL +     std::iter::repeat_with(|| do_something()).take(upper_fn() - 2);
    |
 
 error: map of a closure that does not depend on its parameter over a range
-  --> tests/ui/map_with_unused_argument_over_ranges.rs:37:5
+  --> tests/ui/map_with_unused_argument_over_ranges.rs:42:5
    |
 LL |     (2..=upper_fn()).map(|_| do_something());
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -161,7 +161,7 @@ LL +     std::iter::repeat_with(|| do_something()).take(upper_fn() - 1);
    |
 
 error: map of a closure that does not depend on its parameter over a range
-  --> tests/ui/map_with_unused_argument_over_ranges.rs:39:5
+  --> tests/ui/map_with_unused_argument_over_ranges.rs:44:5
    |
 LL |     (9..3).map(|_| do_something());
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -173,7 +173,7 @@ LL +     std::iter::repeat_with(|| do_something()).take(0);
    |
 
 error: map of a closure that does not depend on its parameter over a range
-  --> tests/ui/map_with_unused_argument_over_ranges.rs:40:5
+  --> tests/ui/map_with_unused_argument_over_ranges.rs:45:5
    |
 LL |     (9..=9).map(|_| do_something());
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -185,7 +185,19 @@ LL +     std::iter::repeat_with(|| do_something()).take(1);
    |
 
 error: map of a closure that does not depend on its parameter over a range
-  --> tests/ui/map_with_unused_argument_over_ranges.rs:59:5
+  --> tests/ui/map_with_unused_argument_over_ranges.rs:46:5
+   |
+LL |     (1..=1 << 4).map(|_| do_something());
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+help: remove the explicit range and use `repeat_with` and `take`
+   |
+LL -     (1..=1 << 4).map(|_| do_something());
+LL +     std::iter::repeat_with(|| do_something()).take((1 << 4) - 0);
+   |
+
+error: map of a closure that does not depend on its parameter over a range
+  --> tests/ui/map_with_unused_argument_over_ranges.rs:65:5
    |
 LL |     (0..10).map(|_| do_something());
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -196,5 +208,5 @@ LL -     (0..10).map(|_| do_something());
 LL +     std::iter::repeat_with(|| do_something()).take(10);
    |
 
-error: aborting due to 16 previous errors
+error: aborting due to 17 previous errors
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`error: map of a closure that does not depend on its parameter over a range`
`2`		`- --> tests/ui/map_with_unused_argument_over_ranges.rs:20:5`
	`2`	`+ --> tests/ui/map_with_unused_argument_over_ranges.rs:25:5`
`3`	`3`	`\|`
`4`	`4`	`LL \| (0..10).map(\|_\| do_something());`
`5`	`5`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -13,7 +13,7 @@ LL + std::iter::repeat_with(\|\| do_something()).take(10);`
`13`	`13`	`\|`
`14`	`14`
`15`	`15`	`error: map of a closure that does not depend on its parameter over a range`
`16`		`- --> tests/ui/map_with_unused_argument_over_ranges.rs:21:5`
	`16`	`+ --> tests/ui/map_with_unused_argument_over_ranges.rs:26:5`
`17`	`17`	`\|`
`18`	`18`	`LL \| (0..10).map(\|_foo\| do_something());`
`19`	`19`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -25,7 +25,7 @@ LL + std::iter::repeat_with(\|\| do_something()).take(10);`
`25`	`25`	`\|`
`26`	`26`
`27`	`27`	`error: map of a closure that does not depend on its parameter over a range`
`28`		`- --> tests/ui/map_with_unused_argument_over_ranges.rs:22:5`
	`28`	`+ --> tests/ui/map_with_unused_argument_over_ranges.rs:27:5`
`29`	`29`	`\|`
`30`	`30`	`LL \| (0..=10).map(\|_\| do_something());`
`31`	`31`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -37,7 +37,7 @@ LL + std::iter::repeat_with(\|\| do_something()).take(11);`
`37`	`37`	`\|`
`38`	`38`
`39`	`39`	`error: map of a closure that does not depend on its parameter over a range`
`40`		`- --> tests/ui/map_with_unused_argument_over_ranges.rs:23:5`
	`40`	`+ --> tests/ui/map_with_unused_argument_over_ranges.rs:28:5`
`41`	`41`	`\|`
`42`	`42`	`LL \| (3..10).map(\|_\| do_something());`
`43`	`43`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -49,7 +49,7 @@ LL + std::iter::repeat_with(\|\| do_something()).take(7);`
`49`	`49`	`\|`
`50`	`50`
`51`	`51`	`error: map of a closure that does not depend on its parameter over a range`
`52`		`- --> tests/ui/map_with_unused_argument_over_ranges.rs:24:5`
	`52`	`+ --> tests/ui/map_with_unused_argument_over_ranges.rs:29:5`
`53`	`53`	`\|`
`54`	`54`	`LL \| (3..=10).map(\|_\| do_something());`
`55`	`55`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -61,7 +61,7 @@ LL + std::iter::repeat_with(\|\| do_something()).take(8);`
`61`	`61`	`\|`
`62`	`62`
`63`	`63`	`error: map of a closure that does not depend on its parameter over a range`
`64`		`- --> tests/ui/map_with_unused_argument_over_ranges.rs:25:5`
	`64`	`+ --> tests/ui/map_with_unused_argument_over_ranges.rs:30:5`
`65`	`65`	`\|`
`66`	`66`	`LL \| (0..10).map(\|_\| 3);`
`67`	`67`	`\| ^^^^^^^^^^^^^^^^^^`
`@@ -72,7 +72,7 @@ LL \| std::iter::repeat(3).take(10);`
`72`	`72`	`\| ~~~~~~~~~~~~~~~~~ ~ +++++++++`
`73`	`73`
`74`	`74`	`error: map of a closure that does not depend on its parameter over a range`
`75`		`- --> tests/ui/map_with_unused_argument_over_ranges.rs:26:5`
	`75`	`+ --> tests/ui/map_with_unused_argument_over_ranges.rs:31:5`
`76`	`76`	`\|`
`77`	`77`	`LL \| / (0..10).map(\|_\| {`
`78`	`78`	`LL \| \| let x = 3;`
`@@ -89,7 +89,7 @@ LL ~ }).take(10);`
`89`	`89`	`\|`
`90`	`90`
`91`	`91`	`error: map of a closure that does not depend on its parameter over a range`
`92`		`- --> tests/ui/map_with_unused_argument_over_ranges.rs:30:5`
	`92`	`+ --> tests/ui/map_with_unused_argument_over_ranges.rs:35:5`
`93`	`93`	`\|`
`94`	`94`	`LL \| (0..10).map(\|_\| do_something()).collect::<Vec<_>>();`
`95`	`95`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -101,7 +101,7 @@ LL + std::iter::repeat_with(\|\| do_something()).take(10).collect::<Vec<_>>();`
`101`	`101`	`\|`
`102`	`102`
`103`	`103`	`error: map of a closure that does not depend on its parameter over a range`
`104`		`- --> tests/ui/map_with_unused_argument_over_ranges.rs:32:5`
	`104`	`+ --> tests/ui/map_with_unused_argument_over_ranges.rs:37:5`
`105`	`105`	`\|`
`106`	`106`	`LL \| (0..upper).map(\|_\| do_something());`
`107`	`107`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -113,7 +113,7 @@ LL + std::iter::repeat_with(\|\| do_something()).take(upper);`
`113`	`113`	`\|`
`114`	`114`
`115`	`115`	`error: map of a closure that does not depend on its parameter over a range`
`116`		`- --> tests/ui/map_with_unused_argument_over_ranges.rs:34:5`
	`116`	`+ --> tests/ui/map_with_unused_argument_over_ranges.rs:39:5`
`117`	`117`	`\|`
`118`	`118`	`LL \| (0..upper_fn()).map(\|_\| do_something());`
`119`	`119`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -125,7 +125,7 @@ LL + std::iter::repeat_with(\|\| do_something()).take(upper_fn());`
`125`	`125`	`\|`
`126`	`126`
`127`	`127`	`error: map of a closure that does not depend on its parameter over a range`
`128`		`- --> tests/ui/map_with_unused_argument_over_ranges.rs:35:5`
	`128`	`+ --> tests/ui/map_with_unused_argument_over_ranges.rs:40:5`
`129`	`129`	`\|`
`130`	`130`	`LL \| (0..=upper_fn()).map(\|_\| do_something());`
`131`	`131`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -137,7 +137,7 @@ LL + std::iter::repeat_with(\|\| do_something()).take(upper_fn() + 1);`
`137`	`137`	`\|`
`138`	`138`
`139`	`139`	`error: map of a closure that does not depend on its parameter over a range`
`140`		`- --> tests/ui/map_with_unused_argument_over_ranges.rs:36:5`
	`140`	`+ --> tests/ui/map_with_unused_argument_over_ranges.rs:41:5`
`141`	`141`	`\|`
`142`	`142`	`LL \| (2..upper_fn()).map(\|_\| do_something());`
`143`	`143`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -149,7 +149,7 @@ LL + std::iter::repeat_with(\|\| do_something()).take(upper_fn() - 2);`
`149`	`149`	`\|`
`150`	`150`
`151`	`151`	`error: map of a closure that does not depend on its parameter over a range`
`152`		`- --> tests/ui/map_with_unused_argument_over_ranges.rs:37:5`
	`152`	`+ --> tests/ui/map_with_unused_argument_over_ranges.rs:42:5`
`153`	`153`	`\|`
`154`	`154`	`LL \| (2..=upper_fn()).map(\|_\| do_something());`
`155`	`155`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -161,7 +161,7 @@ LL + std::iter::repeat_with(\|\| do_something()).take(upper_fn() - 1);`
`161`	`161`	`\|`
`162`	`162`
`163`	`163`	`error: map of a closure that does not depend on its parameter over a range`
`164`		`- --> tests/ui/map_with_unused_argument_over_ranges.rs:39:5`
	`164`	`+ --> tests/ui/map_with_unused_argument_over_ranges.rs:44:5`
`165`	`165`	`\|`
`166`	`166`	`LL \| (9..3).map(\|_\| do_something());`
`167`	`167`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -173,7 +173,7 @@ LL + std::iter::repeat_with(\|\| do_something()).take(0);`
`173`	`173`	`\|`
`174`	`174`
`175`	`175`	`error: map of a closure that does not depend on its parameter over a range`
`176`		`- --> tests/ui/map_with_unused_argument_over_ranges.rs:40:5`
	`176`	`+ --> tests/ui/map_with_unused_argument_over_ranges.rs:45:5`
`177`	`177`	`\|`
`178`	`178`	`LL \| (9..=9).map(\|_\| do_something());`
`179`	`179`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -185,7 +185,19 @@ LL + std::iter::repeat_with(\|\| do_something()).take(1);`
`185`	`185`	`\|`
`186`	`186`
`187`	`187`	`error: map of a closure that does not depend on its parameter over a range`
`188`		`- --> tests/ui/map_with_unused_argument_over_ranges.rs:59:5`
	`188`	`+ --> tests/ui/map_with_unused_argument_over_ranges.rs:46:5`
	`189`	`+ \|`
	`190`	`+LL \| (1..=1 << 4).map(\|_\| do_something());`
	`191`	`+ \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
	`192`	`+ \|`
	`193`	+help: remove the explicit range and use `repeat_with` and `take`
	`194`	`+ \|`
	`195`	`+LL - (1..=1 << 4).map(\|_\| do_something());`
	`196`	`+LL + std::iter::repeat_with(\|\| do_something()).take((1 << 4) - 0);`
	`197`	`+ \|`
	`198`	`+`
	`199`	`+error: map of a closure that does not depend on its parameter over a range`
	`200`	`+ --> tests/ui/map_with_unused_argument_over_ranges.rs:65:5`
`189`	`201`	`\|`
`190`	`202`	`LL \| (0..10).map(\|_\| do_something());`
`191`	`203`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -196,5 +208,5 @@ LL - (0..10).map(\|_\| do_something());`
`196`	`208`	`LL + std::iter::repeat_with(\|\| do_something()).take(10);`
`197`	`209`	`\|`
`198`	`210`
`199`		`-error: aborting due to 16 previous errors`
	`211`	`+error: aborting due to 17 previous errors`
`200`	`212`