Skip to content

Commit f025ab4

Browse files
committed
unnecessary_operation: add space between stmts in suggestion
makes the suggestion a bit more legible
1 parent faba846 commit f025ab4

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

clippy_lints/src/no_effect.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,11 +305,12 @@ fn check_unnecessary_operation(cx: &LateContext<'_>, stmt: &Stmt<'_>) {
305305
for e in reduced {
306306
if let Some(snip) = e.span.get_source_text(cx) {
307307
snippet.push_str(&snip);
308-
snippet.push(';');
308+
snippet.push_str("; ");
309309
} else {
310310
return;
311311
}
312312
}
313+
snippet.pop(); // remove the last space
313314
span_lint_hir_and_then(
314315
cx,
315316
UNNECESSARY_OPERATION,

tests/ui/unnecessary_operation.fixed

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,25 +78,25 @@ fn main() {
7878
//~^ unnecessary_operation
7979
get_number();
8080
//~^ unnecessary_operation
81-
5;get_number();
81+
5; get_number();
8282
//~^ unnecessary_operation
8383
get_number();
8484
//~^ unnecessary_operation
8585
get_number();
8686
//~^ unnecessary_operation
87-
5;6;get_number();
87+
5; 6; get_number();
8888
//~^ unnecessary_operation
8989
get_number();
9090
//~^ unnecessary_operation
9191
get_number();
9292
//~^ unnecessary_operation
93-
5;get_number();
93+
5; get_number();
9494
//~^ unnecessary_operation
95-
42;get_number();
95+
42; get_number();
9696
//~^ unnecessary_operation
9797
assert!([42, 55].len() > get_usize());
9898
//~^ unnecessary_operation
99-
42;get_number();
99+
42; get_number();
100100
//~^ unnecessary_operation
101101
get_number();
102102
//~^ unnecessary_operation

tests/ui/unnecessary_operation.stderr

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ error: unnecessary operation
3535
--> tests/ui/unnecessary_operation.rs:81:5
3636
|
3737
LL | 5 + get_number();
38-
| ^^^^^^^^^^^^^^^^^ help: statement can be reduced to: `5;get_number();`
38+
| ^^^^^^^^^^^^^^^^^ help: statement can be reduced to: `5; get_number();`
3939

4040
error: unnecessary operation
4141
--> tests/ui/unnecessary_operation.rs:83:5
@@ -53,7 +53,7 @@ error: unnecessary operation
5353
--> tests/ui/unnecessary_operation.rs:87:5
5454
|
5555
LL | (5, 6, get_number());
56-
| ^^^^^^^^^^^^^^^^^^^^^ help: statement can be reduced to: `5;6;get_number();`
56+
| ^^^^^^^^^^^^^^^^^^^^^ help: statement can be reduced to: `5; 6; get_number();`
5757

5858
error: unnecessary operation
5959
--> tests/ui/unnecessary_operation.rs:89:5
@@ -71,13 +71,13 @@ error: unnecessary operation
7171
--> tests/ui/unnecessary_operation.rs:93:5
7272
|
7373
LL | 5..get_number();
74-
| ^^^^^^^^^^^^^^^^ help: statement can be reduced to: `5;get_number();`
74+
| ^^^^^^^^^^^^^^^^ help: statement can be reduced to: `5; get_number();`
7575

7676
error: unnecessary operation
7777
--> tests/ui/unnecessary_operation.rs:95:5
7878
|
7979
LL | [42, get_number()];
80-
| ^^^^^^^^^^^^^^^^^^^ help: statement can be reduced to: `42;get_number();`
80+
| ^^^^^^^^^^^^^^^^^^^ help: statement can be reduced to: `42; get_number();`
8181

8282
error: unnecessary operation
8383
--> tests/ui/unnecessary_operation.rs:97:5
@@ -89,7 +89,7 @@ error: unnecessary operation
8989
--> tests/ui/unnecessary_operation.rs:99:5
9090
|
9191
LL | (42, get_number()).1;
92-
| ^^^^^^^^^^^^^^^^^^^^^ help: statement can be reduced to: `42;get_number();`
92+
| ^^^^^^^^^^^^^^^^^^^^^ help: statement can be reduced to: `42; get_number();`
9393

9494
error: unnecessary operation
9595
--> tests/ui/unnecessary_operation.rs:101:5

0 commit comments

Comments
 (0)