Skip to content

Commit 926546e

Browse files
ManishearthManishearth
committed
unnecessary_operation: make test rustfixable
1 parent e1e46e0 commit 926546e

File tree

3 files changed

+112
-27
lines changed

3 files changed

+112
-27
lines changed

‎tests/ui/unnecessary_operation.fixed

+79
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
// run-rustfix
2+
3+
#![feature(box_syntax)]
4+
#![allow(clippy::deref_addrof, dead_code, unused, clippy::no_effect)]
5+
#![warn(clippy::unnecessary_operation)]
6+
7+
struct Tuple(i32);
8+
struct Struct {
9+
field: i32,
10+
}
11+
enum Enum {
12+
Tuple(i32),
13+
Struct { field: i32 },
14+
}
15+
struct DropStruct {
16+
field: i32,
17+
}
18+
impl Drop for DropStruct {
19+
fn drop(&mut self) {}
20+
}
21+
struct DropTuple(i32);
22+
impl Drop for DropTuple {
23+
fn drop(&mut self) {}
24+
}
25+
enum DropEnum {
26+
Tuple(i32),
27+
Struct { field: i32 },
28+
}
29+
impl Drop for DropEnum {
30+
fn drop(&mut self) {}
31+
}
32+
struct FooString {
33+
s: String,
34+
}
35+
36+
fn get_number() -> i32 {
37+
0
38+
}
39+
40+
fn get_usize() -> usize {
41+
0
42+
}
43+
fn get_struct() -> Struct {
44+
Struct { field: 0 }
45+
}
46+
fn get_drop_struct() -> DropStruct {
47+
DropStruct { field: 0 }
48+
}
49+
50+
fn main() {
51+
get_number();
52+
get_number();
53+
get_struct();
54+
get_number();
55+
get_number();
56+
5;get_number();
57+
get_number();
58+
get_number();
59+
5;6;get_number();
60+
get_number();
61+
get_number();
62+
get_number();
63+
5;get_number();
64+
42;get_number();
65+
[42, 55];get_usize();
66+
42;get_number();
67+
get_number();
68+
[42; 55];get_usize();
69+
get_number();
70+
String::from("blah");
71+
72+
// Do not warn
73+
DropTuple(get_number());
74+
DropStruct { field: get_number() };
75+
DropStruct { field: get_number() };
76+
DropStruct { ..get_drop_struct() };
77+
DropEnum::Tuple(get_number());
78+
DropEnum::Struct { field: get_number() };
79+
}

‎tests/ui/unnecessary_operation.rs

+9-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
// run-rustfix
2+
13
#![feature(box_syntax)]
2-
#![allow(clippy::deref_addrof)]
4+
#![allow(clippy::deref_addrof, dead_code, unused, clippy::no_effect)]
35
#![warn(clippy::unnecessary_operation)]
46

57
struct Tuple(i32);
@@ -34,6 +36,10 @@ struct FooString {
3436
fn get_number() -> i32 {
3537
0
3638
}
39+
40+
fn get_usize() -> usize {
41+
0
42+
}
3743
fn get_struct() -> Struct {
3844
Struct { field: 0 }
3945
}
@@ -56,10 +62,10 @@ fn main() {
5662
..get_number();
5763
5..get_number();
5864
[42, get_number()];
59-
[42, 55][get_number() as usize];
65+
[42, 55][get_usize()];
6066
(42, get_number()).1;
6167
[get_number(); 55];
62-
[42; 55][get_number() as usize];
68+
[42; 55][get_usize()];
6369
{
6470
get_number()
6571
};

‎tests/ui/unnecessary_operation.stderr

+24-24
Original file line numberDiff line numberDiff line change
@@ -1,123 +1,123 @@
11
error: statement can be reduced
2-
--> $DIR/unnecessary_operation.rs:45:5
2+
--> $DIR/unnecessary_operation.rs:51:5
33
|
44
LL | Tuple(get_number());
55
| ^^^^^^^^^^^^^^^^^^^^ help: replace it with: `get_number();`
66
|
77
= note: `-D clippy::unnecessary-operation` implied by `-D warnings`
88

99
error: statement can be reduced
10-
--> $DIR/unnecessary_operation.rs:46:5
10+
--> $DIR/unnecessary_operation.rs:52:5
1111
|
1212
LL | Struct { field: get_number() };
1313
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: replace it with: `get_number();`
1414

1515
error: statement can be reduced
16-
--> $DIR/unnecessary_operation.rs:47:5
16+
--> $DIR/unnecessary_operation.rs:53:5
1717
|
1818
LL | Struct { ..get_struct() };
1919
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ help: replace it with: `get_struct();`
2020

2121
error: statement can be reduced
22-
--> $DIR/unnecessary_operation.rs:48:5
22+
--> $DIR/unnecessary_operation.rs:54:5
2323
|
2424
LL | Enum::Tuple(get_number());
2525
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ help: replace it with: `get_number();`
2626

2727
error: statement can be reduced
28-
--> $DIR/unnecessary_operation.rs:49:5
28+
--> $DIR/unnecessary_operation.rs:55:5
2929
|
3030
LL | Enum::Struct { field: get_number() };
3131
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: replace it with: `get_number();`
3232

3333
error: statement can be reduced
34-
--> $DIR/unnecessary_operation.rs:50:5
34+
--> $DIR/unnecessary_operation.rs:56:5
3535
|
3636
LL | 5 + get_number();
3737
| ^^^^^^^^^^^^^^^^^ help: replace it with: `5;get_number();`
3838

3939
error: statement can be reduced
40-
--> $DIR/unnecessary_operation.rs:51:5
40+
--> $DIR/unnecessary_operation.rs:57:5
4141
|
4242
LL | *&get_number();
4343
| ^^^^^^^^^^^^^^^ help: replace it with: `get_number();`
4444

4545
error: statement can be reduced
46-
--> $DIR/unnecessary_operation.rs:52:5
46+
--> $DIR/unnecessary_operation.rs:58:5
4747
|
4848
LL | &get_number();
4949
| ^^^^^^^^^^^^^^ help: replace it with: `get_number();`
5050

5151
error: statement can be reduced
52-
--> $DIR/unnecessary_operation.rs:53:5
52+
--> $DIR/unnecessary_operation.rs:59:5
5353
|
5454
LL | (5, 6, get_number());
5555
| ^^^^^^^^^^^^^^^^^^^^^ help: replace it with: `5;6;get_number();`
5656

5757
error: statement can be reduced
58-
--> $DIR/unnecessary_operation.rs:54:5
58+
--> $DIR/unnecessary_operation.rs:60:5
5959
|
6060
LL | box get_number();
6161
| ^^^^^^^^^^^^^^^^^ help: replace it with: `get_number();`
6262

6363
error: statement can be reduced
64-
--> $DIR/unnecessary_operation.rs:55:5
64+
--> $DIR/unnecessary_operation.rs:61:5
6565
|
6666
LL | get_number()..;
6767
| ^^^^^^^^^^^^^^^ help: replace it with: `get_number();`
6868

6969
error: statement can be reduced
70-
--> $DIR/unnecessary_operation.rs:56:5
70+
--> $DIR/unnecessary_operation.rs:62:5
7171
|
7272
LL | ..get_number();
7373
| ^^^^^^^^^^^^^^^ help: replace it with: `get_number();`
7474

7575
error: statement can be reduced
76-
--> $DIR/unnecessary_operation.rs:57:5
76+
--> $DIR/unnecessary_operation.rs:63:5
7777
|
7878
LL | 5..get_number();
7979
| ^^^^^^^^^^^^^^^^ help: replace it with: `5;get_number();`
8080

8181
error: statement can be reduced
82-
--> $DIR/unnecessary_operation.rs:58:5
82+
--> $DIR/unnecessary_operation.rs:64:5
8383
|
8484
LL | [42, get_number()];
8585
| ^^^^^^^^^^^^^^^^^^^ help: replace it with: `42;get_number();`
8686

8787
error: statement can be reduced
88-
--> $DIR/unnecessary_operation.rs:59:5
88+
--> $DIR/unnecessary_operation.rs:65:5
8989
|
90-
LL | [42, 55][get_number() as usize];
91-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: replace it with: `[42, 55];get_number() as usize;`
90+
LL | [42, 55][get_usize()];
91+
| ^^^^^^^^^^^^^^^^^^^^^^ help: replace it with: `[42, 55];get_usize();`
9292

9393
error: statement can be reduced
94-
--> $DIR/unnecessary_operation.rs:60:5
94+
--> $DIR/unnecessary_operation.rs:66:5
9595
|
9696
LL | (42, get_number()).1;
9797
| ^^^^^^^^^^^^^^^^^^^^^ help: replace it with: `42;get_number();`
9898

9999
error: statement can be reduced
100-
--> $DIR/unnecessary_operation.rs:61:5
100+
--> $DIR/unnecessary_operation.rs:67:5
101101
|
102102
LL | [get_number(); 55];
103103
| ^^^^^^^^^^^^^^^^^^^ help: replace it with: `get_number();`
104104

105105
error: statement can be reduced
106-
--> $DIR/unnecessary_operation.rs:62:5
106+
--> $DIR/unnecessary_operation.rs:68:5
107107
|
108-
LL | [42; 55][get_number() as usize];
109-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: replace it with: `[42; 55];get_number() as usize;`
108+
LL | [42; 55][get_usize()];
109+
| ^^^^^^^^^^^^^^^^^^^^^^ help: replace it with: `[42; 55];get_usize();`
110110

111111
error: statement can be reduced
112-
--> $DIR/unnecessary_operation.rs:63:5
112+
--> $DIR/unnecessary_operation.rs:69:5
113113
|
114114
LL | / {
115115
LL | | get_number()
116116
LL | | };
117117
| |______^ help: replace it with: `get_number();`
118118

119119
error: statement can be reduced
120-
--> $DIR/unnecessary_operation.rs:66:5
120+
--> $DIR/unnecessary_operation.rs:72:5
121121
|
122122
LL | / FooString {
123123
LL | | s: String::from("blah"),

0 commit comments

Comments
 (0)