Skip to content

Commit 50f23ea

Browse files
borsbors
committed
Auto merge of rust-lang#5090 - JohnTitor:split-up-match-same-arms, r=phansch
Split up `match_same_arms` ui test Part of rust-lang#2038 changelog: none
2 parents 87597b5 + 83f6b51 commit 50f23ea

4 files changed

+219
-222
lines changed

‎tests/ui/match_same_arms.rs

-90
Original file line numberDiff line numberDiff line change
@@ -1,114 +1,24 @@
11
#![warn(clippy::match_same_arms)]
2-
#![allow(
3-
clippy::blacklisted_name,
4-
clippy::collapsible_if,
5-
clippy::cognitive_complexity,
6-
clippy::eq_op,
7-
clippy::needless_continue,
8-
clippy::needless_return,
9-
clippy::no_effect,
10-
clippy::zero_divided_by_zero,
11-
clippy::unused_unit
12-
)]
13-
14-
fn bar<T>(_: T) {}
15-
fn foo() -> bool {
16-
unimplemented!()
17-
}
182

193
pub enum Abc {
204
A,
215
B,
226
C,
237
}
248

25-
#[allow(clippy::unused_unit)]
269
fn match_same_arms() {
27-
let _ = match 42 {
28-
42 => {
29-
foo();
30-
let mut a = 42 + [23].len() as i32;
31-
if true {
32-
a += 7;
33-
}
34-
a = -31 - a;
35-
a
36-
},
37-
_ => {
38-
//~ ERROR match arms have same body
39-
foo();
40-
let mut a = 42 + [23].len() as i32;
41-
if true {
42-
a += 7;
43-
}
44-
a = -31 - a;
45-
a
46-
},
47-
};
48-
4910
let _ = match Abc::A {
5011
Abc::A => 0,
5112
Abc::B => 1,
5213
_ => 0, //~ ERROR match arms have same body
5314
};
5415

55-
let _ = match 42 {
56-
42 => foo(),
57-
51 => foo(), //~ ERROR match arms have same body
58-
_ => true,
59-
};
60-
61-
let _ = match Some(42) {
62-
Some(_) => 24,
63-
None => 24, //~ ERROR match arms have same body
64-
};
65-
66-
let _ = match Some(42) {
67-
Some(foo) => 24,
68-
None => 24,
69-
};
70-
71-
let _ = match Some(42) {
72-
Some(42) => 24,
73-
Some(a) => 24, // bindings are different
74-
None => 0,
75-
};
76-
77-
let _ = match Some(42) {
78-
Some(a) if a > 0 => 24,
79-
Some(a) => 24, // one arm has a guard
80-
None => 0,
81-
};
82-
83-
match (Some(42), Some(42)) {
84-
(Some(a), None) => bar(a),
85-
(None, Some(a)) => bar(a), //~ ERROR match arms have same body
86-
_ => (),
87-
}
88-
89-
match (Some(42), Some(42)) {
90-
(Some(a), ..) => bar(a),
91-
(.., Some(a)) => bar(a), //~ ERROR match arms have same body
92-
_ => (),
93-
}
94-
9516
match (1, 2, 3) {
9617
(1, .., 3) => 42,
9718
(.., 3) => 42, //~ ERROR match arms have same body
9819
_ => 0,
9920
};
10021

101-
let _ = match Some(()) {
102-
Some(()) => 0.0,
103-
None => -0.0,
104-
};
105-
106-
match (Some(42), Some("")) {
107-
(Some(a), None) => bar(a),
108-
(None, Some(a)) => bar(a), // bindings have different types
109-
_ => (),
110-
}
111-
11222
let _ = match 42 {
11323
42 => 1,
11424
51 => 1, //~ ERROR match arms have same body

‎tests/ui/match_same_arms.stderr

+26-132
Original file line numberDiff line numberDiff line change
@@ -1,245 +1,139 @@
11
error: this `match` has identical arm bodies
2-
--> $DIR/match_same_arms.rs:37:14
3-
|
4-
LL | _ => {
5-
| ______________^
6-
LL | | //~ ERROR match arms have same body
7-
LL | | foo();
8-
LL | | let mut a = 42 + [23].len() as i32;
9-
... |
10-
LL | | a
11-
LL | | },
12-
| |_________^
13-
|
14-
= note: `-D clippy::match-same-arms` implied by `-D warnings`
15-
note: same as this
16-
--> $DIR/match_same_arms.rs:28:15
17-
|
18-
LL | 42 => {
19-
| _______________^
20-
LL | | foo();
21-
LL | | let mut a = 42 + [23].len() as i32;
22-
LL | | if true {
23-
... |
24-
LL | | a
25-
LL | | },
26-
| |_________^
27-
note: `42` has the same arm body as the `_` wildcard, consider removing it
28-
--> $DIR/match_same_arms.rs:28:15
29-
|
30-
LL | 42 => {
31-
| _______________^
32-
LL | | foo();
33-
LL | | let mut a = 42 + [23].len() as i32;
34-
LL | | if true {
35-
... |
36-
LL | | a
37-
LL | | },
38-
| |_________^
39-
40-
error: this `match` has identical arm bodies
41-
--> $DIR/match_same_arms.rs:52:14
2+
--> $DIR/match_same_arms.rs:13:14
423
|
434
LL | _ => 0, //~ ERROR match arms have same body
445
| ^
456
|
7+
= note: `-D clippy::match-same-arms` implied by `-D warnings`
468
note: same as this
47-
--> $DIR/match_same_arms.rs:50:19
9+
--> $DIR/match_same_arms.rs:11:19
4810
|
4911
LL | Abc::A => 0,
5012
| ^
5113
note: `Abc::A` has the same arm body as the `_` wildcard, consider removing it
52-
--> $DIR/match_same_arms.rs:50:19
14+
--> $DIR/match_same_arms.rs:11:19
5315
|
5416
LL | Abc::A => 0,
5517
| ^
5618

5719
error: this `match` has identical arm bodies
58-
--> $DIR/match_same_arms.rs:57:15
59-
|
60-
LL | 51 => foo(), //~ ERROR match arms have same body
61-
| ^^^^^
62-
|
63-
note: same as this
64-
--> $DIR/match_same_arms.rs:56:15
65-
|
66-
LL | 42 => foo(),
67-
| ^^^^^
68-
help: consider refactoring into `42 | 51`
69-
--> $DIR/match_same_arms.rs:56:9
70-
|
71-
LL | 42 => foo(),
72-
| ^^
73-
74-
error: this `match` has identical arm bodies
75-
--> $DIR/match_same_arms.rs:63:17
76-
|
77-
LL | None => 24, //~ ERROR match arms have same body
78-
| ^^
79-
|
80-
note: same as this
81-
--> $DIR/match_same_arms.rs:62:20
82-
|
83-
LL | Some(_) => 24,
84-
| ^^
85-
help: consider refactoring into `Some(_) | None`
86-
--> $DIR/match_same_arms.rs:62:9
87-
|
88-
LL | Some(_) => 24,
89-
| ^^^^^^^
90-
91-
error: this `match` has identical arm bodies
92-
--> $DIR/match_same_arms.rs:85:28
93-
|
94-
LL | (None, Some(a)) => bar(a), //~ ERROR match arms have same body
95-
| ^^^^^^
96-
|
97-
note: same as this
98-
--> $DIR/match_same_arms.rs:84:28
99-
|
100-
LL | (Some(a), None) => bar(a),
101-
| ^^^^^^
102-
help: consider refactoring into `(Some(a), None) | (None, Some(a))`
103-
--> $DIR/match_same_arms.rs:84:9
104-
|
105-
LL | (Some(a), None) => bar(a),
106-
| ^^^^^^^^^^^^^^^
107-
108-
error: this `match` has identical arm bodies
109-
--> $DIR/match_same_arms.rs:91:26
110-
|
111-
LL | (.., Some(a)) => bar(a), //~ ERROR match arms have same body
112-
| ^^^^^^
113-
|
114-
note: same as this
115-
--> $DIR/match_same_arms.rs:90:26
116-
|
117-
LL | (Some(a), ..) => bar(a),
118-
| ^^^^^^
119-
help: consider refactoring into `(Some(a), ..) | (.., Some(a))`
120-
--> $DIR/match_same_arms.rs:90:9
121-
|
122-
LL | (Some(a), ..) => bar(a),
123-
| ^^^^^^^^^^^^^
124-
125-
error: this `match` has identical arm bodies
126-
--> $DIR/match_same_arms.rs:97:20
20+
--> $DIR/match_same_arms.rs:18:20
12721
|
12822
LL | (.., 3) => 42, //~ ERROR match arms have same body
12923
| ^^
13024
|
13125
note: same as this
132-
--> $DIR/match_same_arms.rs:96:23
26+
--> $DIR/match_same_arms.rs:17:23
13327
|
13428
LL | (1, .., 3) => 42,
13529
| ^^
13630
help: consider refactoring into `(1, .., 3) | (.., 3)`
137-
--> $DIR/match_same_arms.rs:96:9
31+
--> $DIR/match_same_arms.rs:17:9
13832
|
13933
LL | (1, .., 3) => 42,
14034
| ^^^^^^^^^^
14135

14236
error: this `match` has identical arm bodies
143-
--> $DIR/match_same_arms.rs:114:15
37+
--> $DIR/match_same_arms.rs:24:15
14438
|
14539
LL | 51 => 1, //~ ERROR match arms have same body
14640
| ^
14741
|
14842
note: same as this
149-
--> $DIR/match_same_arms.rs:113:15
43+
--> $DIR/match_same_arms.rs:23:15
15044
|
15145
LL | 42 => 1,
15246
| ^
15347
help: consider refactoring into `42 | 51`
154-
--> $DIR/match_same_arms.rs:113:9
48+
--> $DIR/match_same_arms.rs:23:9
15549
|
15650
LL | 42 => 1,
15751
| ^^
15852

15953
error: this `match` has identical arm bodies
160-
--> $DIR/match_same_arms.rs:116:15
54+
--> $DIR/match_same_arms.rs:26:15
16155
|
16256
LL | 52 => 2, //~ ERROR match arms have same body
16357
| ^
16458
|
16559
note: same as this
166-
--> $DIR/match_same_arms.rs:115:15
60+
--> $DIR/match_same_arms.rs:25:15
16761
|
16862
LL | 41 => 2,
16963
| ^
17064
help: consider refactoring into `41 | 52`
171-
--> $DIR/match_same_arms.rs:115:9
65+
--> $DIR/match_same_arms.rs:25:9
17266
|
17367
LL | 41 => 2,
17468
| ^^
17569

17670
error: this `match` has identical arm bodies
177-
--> $DIR/match_same_arms.rs:122:14
71+
--> $DIR/match_same_arms.rs:32:14
17872
|
17973
LL | 2 => 2, //~ ERROR 2nd matched arms have same body
18074
| ^
18175
|
18276
note: same as this
183-
--> $DIR/match_same_arms.rs:121:14
77+
--> $DIR/match_same_arms.rs:31:14
18478
|
18579
LL | 1 => 2,
18680
| ^
18781
help: consider refactoring into `1 | 2`
188-
--> $DIR/match_same_arms.rs:121:9
82+
--> $DIR/match_same_arms.rs:31:9
18983
|
19084
LL | 1 => 2,
19185
| ^
19286

19387
error: this `match` has identical arm bodies
194-
--> $DIR/match_same_arms.rs:123:14
88+
--> $DIR/match_same_arms.rs:33:14
19589
|
19690
LL | 3 => 2, //~ ERROR 3rd matched arms have same body
19791
| ^
19892
|
19993
note: same as this
200-
--> $DIR/match_same_arms.rs:121:14
94+
--> $DIR/match_same_arms.rs:31:14
20195
|
20296
LL | 1 => 2,
20397
| ^
20498
help: consider refactoring into `1 | 3`
205-
--> $DIR/match_same_arms.rs:121:9
99+
--> $DIR/match_same_arms.rs:31:9
206100
|
207101
LL | 1 => 2,
208102
| ^
209103

210104
error: this `match` has identical arm bodies
211-
--> $DIR/match_same_arms.rs:123:14
105+
--> $DIR/match_same_arms.rs:33:14
212106
|
213107
LL | 3 => 2, //~ ERROR 3rd matched arms have same body
214108
| ^
215109
|
216110
note: same as this
217-
--> $DIR/match_same_arms.rs:122:14
111+
--> $DIR/match_same_arms.rs:32:14
218112
|
219113
LL | 2 => 2, //~ ERROR 2nd matched arms have same body
220114
| ^
221115
help: consider refactoring into `2 | 3`
222-
--> $DIR/match_same_arms.rs:122:9
116+
--> $DIR/match_same_arms.rs:32:9
223117
|
224118
LL | 2 => 2, //~ ERROR 2nd matched arms have same body
225119
| ^
226120

227121
error: this `match` has identical arm bodies
228-
--> $DIR/match_same_arms.rs:140:55
122+
--> $DIR/match_same_arms.rs:50:55
229123
|
230124
LL | CommandInfo::External { name, .. } => name.to_string(),
231125
| ^^^^^^^^^^^^^^^^
232126
|
233127
note: same as this
234-
--> $DIR/match_same_arms.rs:139:54
128+
--> $DIR/match_same_arms.rs:49:54
235129
|
236130
LL | CommandInfo::BuiltIn { name, .. } => name.to_string(),
237131
| ^^^^^^^^^^^^^^^^
238132
help: consider refactoring into `CommandInfo::BuiltIn { name, .. } | CommandInfo::External { name, .. }`
239-
--> $DIR/match_same_arms.rs:139:17
133+
--> $DIR/match_same_arms.rs:49:17
240134
|
241135
LL | CommandInfo::BuiltIn { name, .. } => name.to_string(),
242136
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
243137

244-
error: aborting due to 13 previous errors
138+
error: aborting due to 8 previous errors
245139

0 commit comments

Comments
 (0)