Refactoring

Artur-Sulej · Artur-Sulej · commit 202800dbf2a5 · 2025-11-19T08:36:10.000+01:00
diff --git a/clippy_lints/src/operators/decimal_bitwise_operands.rs b/clippy_lints/src/operators/decimal_bitwise_operands.rs
@@ -5,7 +5,6 @@ use rustc_data_structures::packed::Pu128;
 use rustc_hir::{AssignOpKind, BinOpKind, Expr, ExprKind};
 use rustc_lint::LateContext;
 use rustc_span::Span;
-use rustc_span::source_map::Spanned;
 
 use super::DECIMAL_BITWISE_OPERANDS;
 
@@ -17,24 +16,20 @@ pub(super) fn check_binary<'tcx>(cx: &LateContext<'tcx>, op: BinOpKind, left: &'
     for expr in [left, right] {
         if let ExprKind::Lit(lit) = &expr.kind
             && is_decimal_number(cx, lit.span)
-            && !is_power_of_twoish(lit)
+            && !is_power_of_twoish(lit.node)
         {
             emit_lint(cx, lit.span);
         }
     }
 }
 
 pub(super) fn check_assign<'tcx>(cx: &LateContext<'tcx>, op: AssignOpKind, rhs: &'tcx Expr<'_>) {
-    if !matches!(
+    if matches!(
         op,
         AssignOpKind::BitAndAssign | AssignOpKind::BitOrAssign | AssignOpKind::BitXorAssign
-    ) {
-        return;
-    }
-
-    if let ExprKind::Lit(lit) = &rhs.kind
+    ) && let ExprKind::Lit(lit) = &rhs.kind
         && is_decimal_number(cx, lit.span)
-        && !is_power_of_twoish(lit)
+        && !is_power_of_twoish(lit.node)
     {
         emit_lint(cx, lit.span);
     }
@@ -46,8 +41,8 @@ fn is_decimal_number(cx: &LateContext<'_>, span: Span) -> bool {
     })
 }
 
-fn is_power_of_twoish(lit: &Spanned<LitKind>) -> bool {
-    if let LitKind::Int(Pu128(val), _) = lit.node {
+fn is_power_of_twoish(node: LitKind) -> bool {
+    if let LitKind::Int(Pu128(val), _) = node {
         return val.is_power_of_two() || val.wrapping_add(1).is_power_of_two();
     }
     false
diff --git a/tests/ui/decimal_bitwise_operands.rs b/tests/ui/decimal_bitwise_operands.rs
@@ -1,5 +1,4 @@
-#![allow(clippy::erasing_op)]
-#![allow(clippy::no_effect)]
+#![allow(clippy::erasing_op, clippy::no_effect)]
 #![warn(clippy::decimal_bitwise_operands)]
 
 macro_rules! bitwise_op {
diff --git a/tests/ui/decimal_bitwise_operands.stderr b/tests/ui/decimal_bitwise_operands.stderr
@@ -1,5 +1,5 @@
 error: using decimal literal for bitwise operation
-  --> tests/ui/decimal_bitwise_operands.rs:16:9
+  --> tests/ui/decimal_bitwise_operands.rs:15:9
    |
 LL |     x & 99;
    |         ^^
@@ -9,135 +9,135 @@ LL |     x & 99;
    = help: to override `-D warnings` add `#[allow(clippy::decimal_bitwise_operands)]`
 
 error: using decimal literal for bitwise operation
-  --> tests/ui/decimal_bitwise_operands.rs:17:23
+  --> tests/ui/decimal_bitwise_operands.rs:16:23
    |
 LL |     x | (/* comment */99);
    |                       ^^
    |
    = help: use binary (0b...), hex (0x...), or octal (0o...) notation for better readability
 
 error: using decimal literal for bitwise operation
-  --> tests/ui/decimal_bitwise_operands.rs:18:10
+  --> tests/ui/decimal_bitwise_operands.rs:17:10
    |
 LL |     x ^ (99);
    |          ^^
    |
    = help: use binary (0b...), hex (0x...), or octal (0o...) notation for better readability
 
 error: using decimal literal for bitwise operation
-  --> tests/ui/decimal_bitwise_operands.rs:19:10
+  --> tests/ui/decimal_bitwise_operands.rs:18:10
    |
 LL |     x &= 99;
    |          ^^
    |
    = help: use binary (0b...), hex (0x...), or octal (0o...) notation for better readability
 
 error: using decimal literal for bitwise operation
-  --> tests/ui/decimal_bitwise_operands.rs:20:10
+  --> tests/ui/decimal_bitwise_operands.rs:19:10
    |
 LL |     x |= 99;
    |          ^^
    |
    = help: use binary (0b...), hex (0x...), or octal (0o...) notation for better readability
 
 error: using decimal literal for bitwise operation
-  --> tests/ui/decimal_bitwise_operands.rs:21:11
+  --> tests/ui/decimal_bitwise_operands.rs:20:11
    |
 LL |     x ^= (99);
    |           ^^
    |
    = help: use binary (0b...), hex (0x...), or octal (0o...) notation for better readability
 
 error: using decimal literal for bitwise operation
-  --> tests/ui/decimal_bitwise_operands.rs:24:14
+  --> tests/ui/decimal_bitwise_operands.rs:23:14
    |
 LL |     0b1010 & 99;
    |              ^^
    |
    = help: use binary (0b...), hex (0x...), or octal (0o...) notation for better readability
 
 error: using decimal literal for bitwise operation
-  --> tests/ui/decimal_bitwise_operands.rs:25:15
+  --> tests/ui/decimal_bitwise_operands.rs:24:15
    |
 LL |     0b1010 | (99);
    |               ^^
    |
    = help: use binary (0b...), hex (0x...), or octal (0o...) notation for better readability
 
 error: using decimal literal for bitwise operation
-  --> tests/ui/decimal_bitwise_operands.rs:26:28
+  --> tests/ui/decimal_bitwise_operands.rs:25:28
    |
 LL |     0b1010 ^ (/* comment */99);
    |                            ^^
    |
    = help: use binary (0b...), hex (0x...), or octal (0o...) notation for better readability
 
 error: using decimal literal for bitwise operation
-  --> tests/ui/decimal_bitwise_operands.rs:27:5
+  --> tests/ui/decimal_bitwise_operands.rs:26:5
    |
 LL |     99 & 0b1010;
    |     ^^
    |
    = help: use binary (0b...), hex (0x...), or octal (0o...) notation for better readability
 
 error: using decimal literal for bitwise operation
-  --> tests/ui/decimal_bitwise_operands.rs:28:6
+  --> tests/ui/decimal_bitwise_operands.rs:27:6
    |
 LL |     (99) | 0b1010;
    |      ^^
    |
    = help: use binary (0b...), hex (0x...), or octal (0o...) notation for better readability
 
 error: using decimal literal for bitwise operation
-  --> tests/ui/decimal_bitwise_operands.rs:29:19
+  --> tests/ui/decimal_bitwise_operands.rs:28:19
    |
 LL |     (/* comment */99) ^ 0b1010;
    |                   ^^
    |
    = help: use binary (0b...), hex (0x...), or octal (0o...) notation for better readability
 
 error: using decimal literal for bitwise operation
-  --> tests/ui/decimal_bitwise_operands.rs:30:11
+  --> tests/ui/decimal_bitwise_operands.rs:29:11
    |
 LL |     0xD | 99;
    |           ^^
    |
    = help: use binary (0b...), hex (0x...), or octal (0o...) notation for better readability
 
 error: using decimal literal for bitwise operation
-  --> tests/ui/decimal_bitwise_operands.rs:31:5
+  --> tests/ui/decimal_bitwise_operands.rs:30:5
    |
 LL |     88 & 99;
    |     ^^
    |
    = help: use binary (0b...), hex (0x...), or octal (0o...) notation for better readability
 
 error: using decimal literal for bitwise operation
-  --> tests/ui/decimal_bitwise_operands.rs:31:10
+  --> tests/ui/decimal_bitwise_operands.rs:30:10
    |
 LL |     88 & 99;
    |          ^^
    |
    = help: use binary (0b...), hex (0x...), or octal (0o...) notation for better readability
 
 error: using decimal literal for bitwise operation
-  --> tests/ui/decimal_bitwise_operands.rs:35:15
+  --> tests/ui/decimal_bitwise_operands.rs:34:15
    |
 LL |     37 & 38 & 39;
    |               ^^
    |
    = help: use binary (0b...), hex (0x...), or octal (0o...) notation for better readability
 
 error: using decimal literal for bitwise operation
-  --> tests/ui/decimal_bitwise_operands.rs:35:5
+  --> tests/ui/decimal_bitwise_operands.rs:34:5
    |
 LL |     37 & 38 & 39;
    |     ^^
    |
    = help: use binary (0b...), hex (0x...), or octal (0o...) notation for better readability
 
 error: using decimal literal for bitwise operation
-  --> tests/ui/decimal_bitwise_operands.rs:35:10
+  --> tests/ui/decimal_bitwise_operands.rs:34:10
    |
 LL |     37 & 38 & 39;
    |          ^^

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@ use rustc_data_structures::packed::Pu128;`
`5`	`5`	`use rustc_hir::{AssignOpKind, BinOpKind, Expr, ExprKind};`
`6`	`6`	`use rustc_lint::LateContext;`
`7`	`7`	`use rustc_span::Span;`
`8`		`-use rustc_span::source_map::Spanned;`
`9`	`8`
`10`	`9`	`use super::DECIMAL_BITWISE_OPERANDS;`
`11`	`10`
`@@ -17,24 +16,20 @@ pub(super) fn check_binary<'tcx>(cx: &LateContext<'tcx>, op: BinOpKind, left: &'`
`17`	`16`	`for expr in [left, right] {`
`18`	`17`	`if let ExprKind::Lit(lit) = &expr.kind`
`19`	`18`	`&& is_decimal_number(cx, lit.span)`
`20`		`- && !is_power_of_twoish(lit)`
	`19`	`+ && !is_power_of_twoish(lit.node)`
`21`	`20`	`{`
`22`	`21`	`emit_lint(cx, lit.span);`
`23`	`22`	`}`
`24`	`23`	`}`
`25`	`24`	`}`
`26`	`25`
`27`	`26`	`pub(super) fn check_assign<'tcx>(cx: &LateContext<'tcx>, op: AssignOpKind, rhs: &'tcx Expr<'_>) {`
`28`		`- if !matches!(`
	`27`	`+ if matches!(`
`29`	`28`	`op,`
`30`	`29`	`AssignOpKind::BitAndAssign \| AssignOpKind::BitOrAssign \| AssignOpKind::BitXorAssign`
`31`		`- ) {`
`32`		`- return;`
`33`		`- }`
`34`		`-`
`35`		`- if let ExprKind::Lit(lit) = &rhs.kind`
	`30`	`+ ) && let ExprKind::Lit(lit) = &rhs.kind`
`36`	`31`	`&& is_decimal_number(cx, lit.span)`
`37`		`- && !is_power_of_twoish(lit)`
	`32`	`+ && !is_power_of_twoish(lit.node)`
`38`	`33`	`{`
`39`	`34`	`emit_lint(cx, lit.span);`
`40`	`35`	`}`
`@@ -46,8 +41,8 @@ fn is_decimal_number(cx: &LateContext<'_>, span: Span) -> bool {`
`46`	`41`	`})`
`47`	`42`	`}`
`48`	`43`
`49`		`-fn is_power_of_twoish(lit: &Spanned<LitKind>) -> bool {`
`50`		`- if let LitKind::Int(Pu128(val), _) = lit.node {`
	`44`	`+fn is_power_of_twoish(node: LitKind) -> bool {`
	`45`	`+ if let LitKind::Int(Pu128(val), _) = node {`
`51`	`46`	`return val.is_power_of_two() \|\| val.wrapping_add(1).is_power_of_two();`
`52`	`47`	`}`
`53`	`48`	`false`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`error: using decimal literal for bitwise operation`
`2`		`- --> tests/ui/decimal_bitwise_operands.rs:16:9`
	`2`	`+ --> tests/ui/decimal_bitwise_operands.rs:15:9`
`3`	`3`	`\|`
`4`	`4`	`LL \| x & 99;`
`5`	`5`	`\| ^^`
`@@ -9,135 +9,135 @@ LL \| x & 99;`
`9`	`9`	= help: to override `-D warnings` add `#[allow(clippy::decimal_bitwise_operands)]`
`10`	`10`
`11`	`11`	`error: using decimal literal for bitwise operation`
`12`		`- --> tests/ui/decimal_bitwise_operands.rs:17:23`
	`12`	`+ --> tests/ui/decimal_bitwise_operands.rs:16:23`
`13`	`13`	`\|`
`14`	`14`	`LL \| x \| (/* comment */99);`
`15`	`15`	`\| ^^`
`16`	`16`	`\|`
`17`	`17`	`= help: use binary (0b...), hex (0x...), or octal (0o...) notation for better readability`
`18`	`18`
`19`	`19`	`error: using decimal literal for bitwise operation`
`20`		`- --> tests/ui/decimal_bitwise_operands.rs:18:10`
	`20`	`+ --> tests/ui/decimal_bitwise_operands.rs:17:10`
`21`	`21`	`\|`
`22`	`22`	`LL \| x ^ (99);`
`23`	`23`	`\| ^^`
`24`	`24`	`\|`
`25`	`25`	`= help: use binary (0b...), hex (0x...), or octal (0o...) notation for better readability`
`26`	`26`
`27`	`27`	`error: using decimal literal for bitwise operation`
`28`		`- --> tests/ui/decimal_bitwise_operands.rs:19:10`
	`28`	`+ --> tests/ui/decimal_bitwise_operands.rs:18:10`
`29`	`29`	`\|`
`30`	`30`	`LL \| x &= 99;`
`31`	`31`	`\| ^^`
`32`	`32`	`\|`
`33`	`33`	`= help: use binary (0b...), hex (0x...), or octal (0o...) notation for better readability`
`34`	`34`
`35`	`35`	`error: using decimal literal for bitwise operation`
`36`		`- --> tests/ui/decimal_bitwise_operands.rs:20:10`
	`36`	`+ --> tests/ui/decimal_bitwise_operands.rs:19:10`
`37`	`37`	`\|`
`38`	`38`	`LL \| x \|= 99;`
`39`	`39`	`\| ^^`
`40`	`40`	`\|`
`41`	`41`	`= help: use binary (0b...), hex (0x...), or octal (0o...) notation for better readability`
`42`	`42`
`43`	`43`	`error: using decimal literal for bitwise operation`
`44`		`- --> tests/ui/decimal_bitwise_operands.rs:21:11`
	`44`	`+ --> tests/ui/decimal_bitwise_operands.rs:20:11`
`45`	`45`	`\|`
`46`	`46`	`LL \| x ^= (99);`
`47`	`47`	`\| ^^`
`48`	`48`	`\|`
`49`	`49`	`= help: use binary (0b...), hex (0x...), or octal (0o...) notation for better readability`
`50`	`50`
`51`	`51`	`error: using decimal literal for bitwise operation`
`52`		`- --> tests/ui/decimal_bitwise_operands.rs:24:14`
	`52`	`+ --> tests/ui/decimal_bitwise_operands.rs:23:14`
`53`	`53`	`\|`
`54`	`54`	`LL \| 0b1010 & 99;`
`55`	`55`	`\| ^^`
`56`	`56`	`\|`
`57`	`57`	`= help: use binary (0b...), hex (0x...), or octal (0o...) notation for better readability`
`58`	`58`
`59`	`59`	`error: using decimal literal for bitwise operation`
`60`		`- --> tests/ui/decimal_bitwise_operands.rs:25:15`
	`60`	`+ --> tests/ui/decimal_bitwise_operands.rs:24:15`
`61`	`61`	`\|`
`62`	`62`	`LL \| 0b1010 \| (99);`
`63`	`63`	`\| ^^`
`64`	`64`	`\|`
`65`	`65`	`= help: use binary (0b...), hex (0x...), or octal (0o...) notation for better readability`
`66`	`66`
`67`	`67`	`error: using decimal literal for bitwise operation`
`68`		`- --> tests/ui/decimal_bitwise_operands.rs:26:28`
	`68`	`+ --> tests/ui/decimal_bitwise_operands.rs:25:28`
`69`	`69`	`\|`
`70`	`70`	`LL \| 0b1010 ^ (/* comment */99);`
`71`	`71`	`\| ^^`
`72`	`72`	`\|`
`73`	`73`	`= help: use binary (0b...), hex (0x...), or octal (0o...) notation for better readability`
`74`	`74`
`75`	`75`	`error: using decimal literal for bitwise operation`
`76`		`- --> tests/ui/decimal_bitwise_operands.rs:27:5`
	`76`	`+ --> tests/ui/decimal_bitwise_operands.rs:26:5`
`77`	`77`	`\|`
`78`	`78`	`LL \| 99 & 0b1010;`
`79`	`79`	`\| ^^`
`80`	`80`	`\|`
`81`	`81`	`= help: use binary (0b...), hex (0x...), or octal (0o...) notation for better readability`
`82`	`82`
`83`	`83`	`error: using decimal literal for bitwise operation`
`84`		`- --> tests/ui/decimal_bitwise_operands.rs:28:6`
	`84`	`+ --> tests/ui/decimal_bitwise_operands.rs:27:6`
`85`	`85`	`\|`
`86`	`86`	`LL \| (99) \| 0b1010;`
`87`	`87`	`\| ^^`
`88`	`88`	`\|`
`89`	`89`	`= help: use binary (0b...), hex (0x...), or octal (0o...) notation for better readability`
`90`	`90`
`91`	`91`	`error: using decimal literal for bitwise operation`
`92`		`- --> tests/ui/decimal_bitwise_operands.rs:29:19`
	`92`	`+ --> tests/ui/decimal_bitwise_operands.rs:28:19`
`93`	`93`	`\|`
`94`	`94`	`LL \| (/* comment */99) ^ 0b1010;`
`95`	`95`	`\| ^^`
`96`	`96`	`\|`
`97`	`97`	`= help: use binary (0b...), hex (0x...), or octal (0o...) notation for better readability`
`98`	`98`
`99`	`99`	`error: using decimal literal for bitwise operation`
`100`		`- --> tests/ui/decimal_bitwise_operands.rs:30:11`
	`100`	`+ --> tests/ui/decimal_bitwise_operands.rs:29:11`
`101`	`101`	`\|`
`102`	`102`	`LL \| 0xD \| 99;`
`103`	`103`	`\| ^^`
`104`	`104`	`\|`
`105`	`105`	`= help: use binary (0b...), hex (0x...), or octal (0o...) notation for better readability`
`106`	`106`
`107`	`107`	`error: using decimal literal for bitwise operation`
`108`		`- --> tests/ui/decimal_bitwise_operands.rs:31:5`
	`108`	`+ --> tests/ui/decimal_bitwise_operands.rs:30:5`
`109`	`109`	`\|`
`110`	`110`	`LL \| 88 & 99;`
`111`	`111`	`\| ^^`
`112`	`112`	`\|`
`113`	`113`	`= help: use binary (0b...), hex (0x...), or octal (0o...) notation for better readability`
`114`	`114`
`115`	`115`	`error: using decimal literal for bitwise operation`
`116`		`- --> tests/ui/decimal_bitwise_operands.rs:31:10`
	`116`	`+ --> tests/ui/decimal_bitwise_operands.rs:30:10`
`117`	`117`	`\|`
`118`	`118`	`LL \| 88 & 99;`
`119`	`119`	`\| ^^`
`120`	`120`	`\|`
`121`	`121`	`= help: use binary (0b...), hex (0x...), or octal (0o...) notation for better readability`
`122`	`122`
`123`	`123`	`error: using decimal literal for bitwise operation`
`124`		`- --> tests/ui/decimal_bitwise_operands.rs:35:15`
	`124`	`+ --> tests/ui/decimal_bitwise_operands.rs:34:15`
`125`	`125`	`\|`
`126`	`126`	`LL \| 37 & 38 & 39;`
`127`	`127`	`\| ^^`
`128`	`128`	`\|`
`129`	`129`	`= help: use binary (0b...), hex (0x...), or octal (0o...) notation for better readability`
`130`	`130`
`131`	`131`	`error: using decimal literal for bitwise operation`
`132`		`- --> tests/ui/decimal_bitwise_operands.rs:35:5`
	`132`	`+ --> tests/ui/decimal_bitwise_operands.rs:34:5`
`133`	`133`	`\|`
`134`	`134`	`LL \| 37 & 38 & 39;`
`135`	`135`	`\| ^^`
`136`	`136`	`\|`
`137`	`137`	`= help: use binary (0b...), hex (0x...), or octal (0o...) notation for better readability`
`138`	`138`
`139`	`139`	`error: using decimal literal for bitwise operation`
`140`		`- --> tests/ui/decimal_bitwise_operands.rs:35:10`
	`140`	`+ --> tests/ui/decimal_bitwise_operands.rs:34:10`
`141`	`141`	`\|`
`142`	`142`	`LL \| 37 & 38 & 39;`
`143`	`143`	`\| ^^`