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

Make shadow_reuse suggestion less verbose #7782

Merged
merged 1 commit into from
Oct 7, 2021
Merged

Make shadow_reuse suggestion less verbose #7782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions clippy_lints/src/shadow.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,11 +162,7 @@ fn lint_shadow(cx: &LateContext<'_>, pat: &Pat<'_>, shadowed: HirId, span: Span)
(SHADOW_SAME, msg)
},
Some(expr) if is_local_used(cx, expr, shadowed) => {
let msg = format!(
"`{}` is shadowed by `{}` which reuses the original value",
snippet(cx, pat.span, "_"),
snippet(cx, expr.span, "..")
);
let msg = format!("`{}` is shadowed", snippet(cx, pat.span, "_"));
(SHADOW_REUSE, msg)
},
_ => {
Expand Down
5 changes: 5 additions & 0 deletions tests/ui/shadow.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ fn shadow_reuse() -> Option<()> {
let x = foo(x);
let x = || x;
let x = Some(1).map(|_| x)?;
let y = 1;
let y = match y {
1 => 2,
_ => 3,
};
None
}

Expand Down
60 changes: 36 additions & 24 deletions tests/ui/shadow.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ note: previous binding is here
LL | let x = &mut x;
| ^

error: `x` is shadowed by `x.0` which reuses the original value
error: `x` is shadowed
--> $DIR/shadow.rs:13:9
|
LL | let x = x.0;
Expand All @@ -60,7 +60,7 @@ note: previous binding is here
LL | let x = ([[0]], ());
| ^

error: `x` is shadowed by `x[0]` which reuses the original value
error: `x` is shadowed
--> $DIR/shadow.rs:14:9
|
LL | let x = x[0];
Expand All @@ -72,7 +72,7 @@ note: previous binding is here
LL | let x = x.0;
| ^

error: `x` is shadowed by `x` which reuses the original value
error: `x` is shadowed
--> $DIR/shadow.rs:15:10
|
LL | let [x] = x;
Expand All @@ -84,7 +84,7 @@ note: previous binding is here
LL | let x = x[0];
| ^

error: `x` is shadowed by `Some(x)` which reuses the original value
error: `x` is shadowed
--> $DIR/shadow.rs:16:9
|
LL | let x = Some(x);
Expand All @@ -96,7 +96,7 @@ note: previous binding is here
LL | let [x] = x;
| ^

error: `x` is shadowed by `foo(x)` which reuses the original value
error: `x` is shadowed
--> $DIR/shadow.rs:17:9
|
LL | let x = foo(x);
Expand All @@ -108,7 +108,7 @@ note: previous binding is here
LL | let x = Some(x);
| ^

error: `x` is shadowed by `|| x` which reuses the original value
error: `x` is shadowed
--> $DIR/shadow.rs:18:9
|
LL | let x = || x;
Expand All @@ -120,7 +120,7 @@ note: previous binding is here
LL | let x = foo(x);
| ^

error: `x` is shadowed by `Some(1).map(|_| x)?` which reuses the original value
error: `x` is shadowed
--> $DIR/shadow.rs:19:9
|
LL | let x = Some(1).map(|_| x)?;
Expand All @@ -132,102 +132,114 @@ note: previous binding is here
LL | let x = || x;
| ^

error: `y` is shadowed
--> $DIR/shadow.rs:21:9
|
LL | let y = match y {
| ^
|
note: previous binding is here
--> $DIR/shadow.rs:20:9
|
LL | let y = 1;
| ^

error: `x` shadows a previous, unrelated binding
--> $DIR/shadow.rs:25:9
--> $DIR/shadow.rs:30:9
|
LL | let x = 2;
| ^
|
= note: `-D clippy::shadow-unrelated` implied by `-D warnings`
note: previous binding is here
--> $DIR/shadow.rs:24:9
--> $DIR/shadow.rs:29:9
|
LL | let x = 1;
| ^

error: `x` shadows a previous, unrelated binding
--> $DIR/shadow.rs:30:13
--> $DIR/shadow.rs:35:13
|
LL | let x = 1;
| ^
|
note: previous binding is here
--> $DIR/shadow.rs:29:10
--> $DIR/shadow.rs:34:10
|
LL | fn f(x: u32) {
| ^

error: `x` shadows a previous, unrelated binding
--> $DIR/shadow.rs:35:14
--> $DIR/shadow.rs:40:14
|
LL | Some(x) => {
| ^
|
note: previous binding is here
--> $DIR/shadow.rs:32:9
--> $DIR/shadow.rs:37:9
|
LL | let x = 1;
| ^

error: `x` shadows a previous, unrelated binding
--> $DIR/shadow.rs:36:17
--> $DIR/shadow.rs:41:17
|
LL | let x = 1;
| ^
|
note: previous binding is here
--> $DIR/shadow.rs:35:14
--> $DIR/shadow.rs:40:14
|
LL | Some(x) => {
| ^

error: `x` shadows a previous, unrelated binding
--> $DIR/shadow.rs:40:17
--> $DIR/shadow.rs:45:17
|
LL | if let Some(x) = Some(1) {}
| ^
|
note: previous binding is here
--> $DIR/shadow.rs:32:9
--> $DIR/shadow.rs:37:9
|
LL | let x = 1;
| ^

error: `x` shadows a previous, unrelated binding
--> $DIR/shadow.rs:41:20
--> $DIR/shadow.rs:46:20
|
LL | while let Some(x) = Some(1) {}
| ^
|
note: previous binding is here
--> $DIR/shadow.rs:32:9
--> $DIR/shadow.rs:37:9
|
LL | let x = 1;
| ^

error: `x` shadows a previous, unrelated binding
--> $DIR/shadow.rs:42:15
--> $DIR/shadow.rs:47:15
|
LL | let _ = |[x]: [u32; 1]| {
| ^
|
note: previous binding is here
--> $DIR/shadow.rs:32:9
--> $DIR/shadow.rs:37:9
|
LL | let x = 1;
| ^

error: `x` shadows a previous, unrelated binding
--> $DIR/shadow.rs:43:13
--> $DIR/shadow.rs:48:13
|
LL | let x = 1;
| ^
|
note: previous binding is here
--> $DIR/shadow.rs:42:15
--> $DIR/shadow.rs:47:15
|
LL | let _ = |[x]: [u32; 1]| {
| ^

error: aborting due to 19 previous errors
error: aborting due to 20 previous errors