Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix almost_swapped: Ignore external macros #10502

Merged
merged 3 commits into from Mar 17, 2023
Merged

fix almost_swapped: Ignore external macros #10502

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3eea494
Ignore external macros
blyxyas Mar 14, 2023
e2ba75d
Add macro test
blyxyas Mar 15, 2023
9546517
Add external macro test + Now it works
blyxyas Mar 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions clippy_lints/src/swap.rs
View file
Open in desktop
Expand Up @@ -6,7 +6,8 @@ use clippy_utils::{can_mut_borrow_both, eq_expr_value, in_constant, std_or_core}
use if_chain::if_chain;
use rustc_errors::Applicability;
use rustc_hir::{BinOpKind, Block, Expr, ExprKind, PatKind, QPath, Stmt, StmtKind};
use rustc_lint::{LateContext, LateLintPass};
use rustc_lint::{LateContext, LateLintPass, LintContext};
use rustc_middle::lint::in_external_macro;
use rustc_middle::ty;
use rustc_session::{declare_lint_pass, declare_tool_lint};
use rustc_span::source_map::Spanned;
Expand Down Expand Up @@ -75,7 +76,9 @@ declare_lint_pass!(Swap => [MANUAL_SWAP, ALMOST_SWAPPED]);
impl<'tcx> LateLintPass<'tcx> for Swap {
fn check_block(&mut self, cx: &LateContext<'tcx>, block: &'tcx Block<'_>) {
check_manual_swap(cx, block);
check_suspicious_swap(cx, block);
if !in_external_macro(cx.sess(), block.span) {
check_suspicious_swap(cx, block);
}
check_xor_swap(cx, block);
}
}
Expand Down
13 changes: 11 additions & 2 deletions tests/ui/swap.fixed
View file
Open in desktop
Expand Up @@ -8,7 +8,8 @@
redundant_semicolons,
dead_code,
unused_assignments,
unused_variables
unused_variables,
clippy::let_and_return
)]

struct Foo(u32);
Expand Down Expand Up @@ -187,8 +188,16 @@ const fn issue_9864(mut u: u32) -> u32 {
u + v
}

#[allow(clippy::let_and_return)]
macro_rules! issue_10421 {
blyxyas marked this conversation as resolved.
Show resolved Hide resolved
() => {
let a = 1;
let b = a;
let b = b;
blyxyas marked this conversation as resolved.
Show resolved Hide resolved
};
}

const fn issue_10421(x: u32) -> u32 {
issue_10421!();
let a = x;
let a = a;
let a = a;
Expand Down
13 changes: 11 additions & 2 deletions tests/ui/swap.rs
View file
Open in desktop
Expand Up @@ -8,7 +8,8 @@
redundant_semicolons,
dead_code,
unused_assignments,
unused_variables
unused_variables,
clippy::let_and_return
)]

struct Foo(u32);
Expand Down Expand Up @@ -216,8 +217,16 @@ const fn issue_9864(mut u: u32) -> u32 {
u + v
}

#[allow(clippy::let_and_return)]
macro_rules! issue_10421 {
() => {
let a = 1;
let b = a;
let b = b;
};
}

const fn issue_10421(x: u32) -> u32 {
issue_10421!();
let a = x;
let a = a;
let a = a;
Expand Down
34 changes: 17 additions & 17 deletions tests/ui/swap.stderr
View file
Open in desktop
@@ -1,5 +1,5 @@
error: this looks like you are swapping `bar.a` and `bar.b` manually
--> $DIR/swap.rs:25:5
--> $DIR/swap.rs:26:5
|
LL | / let temp = bar.a;
LL | | bar.a = bar.b;
Expand All @@ -10,55 +10,55 @@ LL | | bar.b = temp;
= note: `-D clippy::manual-swap` implied by `-D warnings`

error: this looks like you are swapping elements of `foo` manually
--> $DIR/swap.rs:37:5
--> $DIR/swap.rs:38:5
|
LL | / let temp = foo[0];
LL | | foo[0] = foo[1];
LL | | foo[1] = temp;
| |__________________^ help: try: `foo.swap(0, 1);`

error: this looks like you are swapping elements of `foo` manually
--> $DIR/swap.rs:46:5
--> $DIR/swap.rs:47:5
|
LL | / let temp = foo[0];
LL | | foo[0] = foo[1];
LL | | foo[1] = temp;
| |__________________^ help: try: `foo.swap(0, 1);`

error: this looks like you are swapping elements of `foo` manually
--> $DIR/swap.rs:65:5
--> $DIR/swap.rs:66:5
|
LL | / let temp = foo[0];
LL | | foo[0] = foo[1];
LL | | foo[1] = temp;
| |__________________^ help: try: `foo.swap(0, 1);`

error: this looks like you are swapping `a` and `b` manually
--> $DIR/swap.rs:76:5
--> $DIR/swap.rs:77:5
|
LL | / a ^= b;
LL | | b ^= a;
LL | | a ^= b;
| |___________^ help: try: `std::mem::swap(&mut a, &mut b);`

error: this looks like you are swapping `bar.a` and `bar.b` manually
--> $DIR/swap.rs:84:5
--> $DIR/swap.rs:85:5
|
LL | / bar.a ^= bar.b;
LL | | bar.b ^= bar.a;
LL | | bar.a ^= bar.b;
| |___________________^ help: try: `std::mem::swap(&mut bar.a, &mut bar.b);`

error: this looks like you are swapping elements of `foo` manually
--> $DIR/swap.rs:92:5
--> $DIR/swap.rs:93:5
|
LL | / foo[0] ^= foo[1];
LL | | foo[1] ^= foo[0];
LL | | foo[0] ^= foo[1];
| |_____________________^ help: try: `foo.swap(0, 1);`

error: this looks like you are swapping `foo[0][1]` and `bar[1][0]` manually
--> $DIR/swap.rs:121:5
--> $DIR/swap.rs:122:5
|
LL | / let temp = foo[0][1];
LL | | foo[0][1] = bar[1][0];
Expand All @@ -68,7 +68,7 @@ LL | | bar[1][0] = temp;
= note: or maybe you should use `std::mem::replace`?

error: this looks like you are swapping `a` and `b` manually
--> $DIR/swap.rs:135:7
--> $DIR/swap.rs:136:7
|
LL | ; let t = a;
| _______^
Expand All @@ -79,7 +79,7 @@ LL | | b = t;
= note: or maybe you should use `std::mem::replace`?

error: this looks like you are swapping `c.0` and `a` manually
--> $DIR/swap.rs:144:7
--> $DIR/swap.rs:145:7
|
LL | ; let t = c.0;
| _______^
Expand All @@ -90,7 +90,7 @@ LL | | a = t;
= note: or maybe you should use `std::mem::replace`?

error: this looks like you are swapping `b` and `a` manually
--> $DIR/swap.rs:170:5
--> $DIR/swap.rs:171:5
|
LL | / let t = b;
LL | | b = a;
Expand All @@ -100,7 +100,7 @@ LL | | a = t;
= note: or maybe you should use `std::mem::replace`?

error: this looks like you are trying to swap `a` and `b`
--> $DIR/swap.rs:132:5
--> $DIR/swap.rs:133:5
|
LL | / a = b;
LL | | b = a;
Expand All @@ -110,7 +110,7 @@ LL | | b = a;
= note: `-D clippy::almost-swapped` implied by `-D warnings`

error: this looks like you are trying to swap `c.0` and `a`
--> $DIR/swap.rs:141:5
--> $DIR/swap.rs:142:5
|
LL | / c.0 = a;
LL | | a = c.0;
Expand All @@ -119,7 +119,7 @@ LL | | a = c.0;
= note: or maybe you should use `std::mem::replace`?

error: this looks like you are trying to swap `a` and `b`
--> $DIR/swap.rs:148:5
--> $DIR/swap.rs:149:5
|
LL | / let a = b;
LL | | let b = a;
Expand All @@ -128,7 +128,7 @@ LL | | let b = a;
= note: or maybe you should use `std::mem::replace`?

error: this looks like you are trying to swap `d` and `c`
--> $DIR/swap.rs:153:5
--> $DIR/swap.rs:154:5
|
LL | / d = c;
LL | | c = d;
Expand All @@ -137,7 +137,7 @@ LL | | c = d;
= note: or maybe you should use `std::mem::replace`?

error: this looks like you are trying to swap `a` and `b`
--> $DIR/swap.rs:157:5
--> $DIR/swap.rs:158:5
|
LL | / let a = b;
LL | | b = a;
Expand All @@ -146,7 +146,7 @@ LL | | b = a;
= note: or maybe you should use `std::mem::replace`?

error: this looks like you are swapping `s.0.x` and `s.0.y` manually
--> $DIR/swap.rs:205:5
--> $DIR/swap.rs:206:5
|
LL | / let t = s.0.x;
LL | | s.0.x = s.0.y;
Expand Down