Skip to content

UI test cleanup: Extract match_overlapping_arm tests #3398

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

Merged
merged 1 commit into from
Nov 2, 2018
+245 −227
Merged

UI test cleanup: Extract match_overlapping_arm tests #3398

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
75 changes: 75 additions & 0 deletions tests/ui/match_overlapping_arm.rs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
// Copyright 2014-2018 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(exclusive_range_pattern)]
#![warn(clippy::match_overlapping_arm)]
#![allow(clippy::redundant_pattern_matching)]

/// Tests for match_overlapping_arm
fn overlapping() {
const FOO : u64 = 2;

match 42 {
0 ... 10 => println!("0 ... 10"),
0 ... 11 => println!("0 ... 11"),
_ => (),
}

match 42 {
0 ... 5 => println!("0 ... 5"),
6 ... 7 => println!("6 ... 7"),
FOO ... 11 => println!("0 ... 11"),
_ => (),
}

match 42 {
2 => println!("2"),
0 ... 5 => println!("0 ... 5"),
_ => (),
}

match 42 {
2 => println!("2"),
0 ... 2 => println!("0 ... 2"),
_ => (),
}

match 42 {
0 ... 10 => println!("0 ... 10"),
11 ... 50 => println!("11 ... 50"),
_ => (),
}

match 42 {
2 => println!("2"),
0 .. 2 => println!("0 .. 2"),
_ => (),
}

match 42 {
0 .. 10 => println!("0 .. 10"),
10 .. 50 => println!("10 .. 50"),
_ => (),
}

match 42 {
0 .. 11 => println!("0 .. 11"),
0 ... 11 => println!("0 ... 11"),
_ => (),
}

if let None = Some(42) {
// nothing
} else if let None = Some(42) {
// another nothing :-)
}
}

fn main() {}
63 changes: 63 additions & 0 deletions tests/ui/match_overlapping_arm.stderr
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
error: some ranges overlap
--> $DIR/match_overlapping_arm.rs:20:9
|
20 | 0 ... 10 => println!("0 ... 10"),
| ^^^^^^^^
|
= note: `-D clippy::match-overlapping-arm` implied by `-D warnings`
note: overlaps with this
--> $DIR/match_overlapping_arm.rs:21:9
|
21 | 0 ... 11 => println!("0 ... 11"),
| ^^^^^^^^

error: some ranges overlap
--> $DIR/match_overlapping_arm.rs:26:9
|
26 | 0 ... 5 => println!("0 ... 5"),
| ^^^^^^^
|
note: overlaps with this
--> $DIR/match_overlapping_arm.rs:28:9
|
28 | FOO ... 11 => println!("0 ... 11"),
| ^^^^^^^^^^

error: some ranges overlap
--> $DIR/match_overlapping_arm.rs:34:9
|
34 | 0 ... 5 => println!("0 ... 5"),
| ^^^^^^^
|
note: overlaps with this
--> $DIR/match_overlapping_arm.rs:33:9
|
33 | 2 => println!("2"),
| ^

error: some ranges overlap
--> $DIR/match_overlapping_arm.rs:40:9
|
40 | 0 ... 2 => println!("0 ... 2"),
| ^^^^^^^
|
note: overlaps with this
--> $DIR/match_overlapping_arm.rs:39:9
|
39 | 2 => println!("2"),
| ^

error: some ranges overlap
--> $DIR/match_overlapping_arm.rs:63:9
|
63 | 0 .. 11 => println!("0 .. 11"),
| ^^^^^^^
|
note: overlaps with this
--> $DIR/match_overlapping_arm.rs:64:9
|
64 | 0 ... 11 => println!("0 ... 11"),
| ^^^^^^^^

error: aborting due to 5 previous errors

59 changes: 0 additions & 59 deletions tests/ui/matches.rs
View file
Original file line number Diff line number Diff line change
@@ -74,65 +74,6 @@ fn ref_pats() {
}
}

fn overlapping() {
const FOO : u64 = 2;

match 42 {
0 ... 10 => println!("0 ... 10"),
0 ... 11 => println!("0 ... 11"),
_ => (),
}

match 42 {
0 ... 5 => println!("0 ... 5"),
6 ... 7 => println!("6 ... 7"),
FOO ... 11 => println!("0 ... 11"),
_ => (),
}

match 42 {
2 => println!("2"),
0 ... 5 => println!("0 ... 5"),
_ => (),
}

match 42 {
2 => println!("2"),
0 ... 2 => println!("0 ... 2"),
_ => (),
}

match 42 {
0 ... 10 => println!("0 ... 10"),
11 ... 50 => println!("11 ... 50"),
_ => (),
}

match 42 {
2 => println!("2"),
0 .. 2 => println!("0 .. 2"),
_ => (),
}

match 42 {
0 .. 10 => println!("0 .. 10"),
10 .. 50 => println!("10 .. 50"),
_ => (),
}

match 42 {
0 .. 11 => println!("0 .. 11"),
0 ... 11 => println!("0 ... 11"),
_ => (),
}

if let None = Some(42) {
// nothing
} else if let None = Some(42) {
// another nothing :-)
}
}

fn match_wild_err_arm() {
let x: Result<i32, &str> = Ok(3);

275 changes: 107 additions & 168 deletions tests/ui/matches.stderr
View file
Original file line number Diff line number Diff line change
@@ -88,276 +88,215 @@ help: try
72 | if let None = b {
| ^^^^ ^

error: some ranges overlap
--> $DIR/matches.rs:81:9
|
81 | 0 ... 10 => println!("0 ... 10"),
| ^^^^^^^^
|
= note: `-D clippy::match-overlapping-arm` implied by `-D warnings`
note: overlaps with this
--> $DIR/matches.rs:82:9
|
82 | 0 ... 11 => println!("0 ... 11"),
| ^^^^^^^^

error: some ranges overlap
--> $DIR/matches.rs:87:9
|
87 | 0 ... 5 => println!("0 ... 5"),
| ^^^^^^^
error: Err(_) will match all errors, maybe not a good idea
--> $DIR/matches.rs:83:9
|
note: overlaps with this
--> $DIR/matches.rs:89:9
83 | Err(_) => panic!("err")
| ^^^^^^
|
89 | FOO ... 11 => println!("0 ... 11"),
| ^^^^^^^^^^
= note: `-D clippy::match-wild-err-arm` implied by `-D warnings`
= note: to remove this warning, match each error separately or use unreachable macro

error: some ranges overlap
--> $DIR/matches.rs:95:9
|
95 | 0 ... 5 => println!("0 ... 5"),
| ^^^^^^^
error: this `match` has identical arm bodies
--> $DIR/matches.rs:82:18
|
note: overlaps with this
--> $DIR/matches.rs:94:9
82 | Ok(_) => println!("ok"),
| ^^^^^^^^^^^^^^
|
94 | 2 => println!("2"),
| ^

error: some ranges overlap
--> $DIR/matches.rs:101:9
|
101 | 0 ... 2 => println!("0 ... 2"),
| ^^^^^^^
|
note: overlaps with this
--> $DIR/matches.rs:100:9
|
100 | 2 => println!("2"),
| ^

error: some ranges overlap
--> $DIR/matches.rs:124:9
|
124 | 0 .. 11 => println!("0 .. 11"),
| ^^^^^^^
|
note: overlaps with this
--> $DIR/matches.rs:125:9
|
125 | 0 ... 11 => println!("0 ... 11"),
| ^^^^^^^^

error: Err(_) will match all errors, maybe not a good idea
--> $DIR/matches.rs:142:9
|
142 | Err(_) => panic!("err")
| ^^^^^^
|
= note: `-D clippy::match-wild-err-arm` implied by `-D warnings`
= note: to remove this warning, match each error separately or use unreachable macro

error: this `match` has identical arm bodies
--> $DIR/matches.rs:141:18
|
141 | Ok(_) => println!("ok"),
| ^^^^^^^^^^^^^^
|
= note: `-D clippy::match-same-arms` implied by `-D warnings`
= note: `-D clippy::match-same-arms` implied by `-D warnings`
note: same as this
--> $DIR/matches.rs:140:18
|
140 | Ok(3) => println!("ok"),
| ^^^^^^^^^^^^^^
--> $DIR/matches.rs:81:18
|
81 | Ok(3) => println!("ok"),
| ^^^^^^^^^^^^^^
note: consider refactoring into `Ok(3) | Ok(_)`
--> $DIR/matches.rs:140:18
|
140 | Ok(3) => println!("ok"),
| ^^^^^^^^^^^^^^
= note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
--> $DIR/matches.rs:81:18
|
81 | Ok(3) => println!("ok"),
| ^^^^^^^^^^^^^^
= note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)

error: Err(_) will match all errors, maybe not a good idea
--> $DIR/matches.rs:148:9
|
148 | Err(_) => {panic!()}
| ^^^^^^
|
= note: to remove this warning, match each error separately or use unreachable macro
--> $DIR/matches.rs:89:9
|
89 | Err(_) => {panic!()}
| ^^^^^^
|
= note: to remove this warning, match each error separately or use unreachable macro

error: this `match` has identical arm bodies
--> $DIR/matches.rs:147:18
|
147 | Ok(_) => println!("ok"),
| ^^^^^^^^^^^^^^
|
--> $DIR/matches.rs:88:18
|
88 | Ok(_) => println!("ok"),
| ^^^^^^^^^^^^^^
|
note: same as this
--> $DIR/matches.rs:146:18
|
146 | Ok(3) => println!("ok"),
| ^^^^^^^^^^^^^^
--> $DIR/matches.rs:87:18
|
87 | Ok(3) => println!("ok"),
| ^^^^^^^^^^^^^^
note: consider refactoring into `Ok(3) | Ok(_)`
--> $DIR/matches.rs:146:18
|
146 | Ok(3) => println!("ok"),
| ^^^^^^^^^^^^^^
= note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
--> $DIR/matches.rs:87:18
|
87 | Ok(3) => println!("ok"),
| ^^^^^^^^^^^^^^
= note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)

error: Err(_) will match all errors, maybe not a good idea
--> $DIR/matches.rs:154:9
|
154 | Err(_) => {panic!();}
| ^^^^^^
|
= note: to remove this warning, match each error separately or use unreachable macro
--> $DIR/matches.rs:95:9
|
95 | Err(_) => {panic!();}
| ^^^^^^
|
= note: to remove this warning, match each error separately or use unreachable macro

error: this `match` has identical arm bodies
--> $DIR/matches.rs:153:18
|
153 | Ok(_) => println!("ok"),
| ^^^^^^^^^^^^^^
|
--> $DIR/matches.rs:94:18
|
94 | Ok(_) => println!("ok"),
| ^^^^^^^^^^^^^^
|
note: same as this
--> $DIR/matches.rs:152:18
|
152 | Ok(3) => println!("ok"),
| ^^^^^^^^^^^^^^
--> $DIR/matches.rs:93:18
|
93 | Ok(3) => println!("ok"),
| ^^^^^^^^^^^^^^
note: consider refactoring into `Ok(3) | Ok(_)`
--> $DIR/matches.rs:152:18
|
152 | Ok(3) => println!("ok"),
| ^^^^^^^^^^^^^^
= note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
--> $DIR/matches.rs:93:18
|
93 | Ok(3) => println!("ok"),
| ^^^^^^^^^^^^^^
= note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)

error: this `match` has identical arm bodies
--> $DIR/matches.rs:160:18
--> $DIR/matches.rs:101:18
|
160 | Ok(_) => println!("ok"),
101 | Ok(_) => println!("ok"),
| ^^^^^^^^^^^^^^
|
note: same as this
--> $DIR/matches.rs:159:18
--> $DIR/matches.rs:100:18
|
159 | Ok(3) => println!("ok"),
100 | Ok(3) => println!("ok"),
| ^^^^^^^^^^^^^^
note: consider refactoring into `Ok(3) | Ok(_)`
--> $DIR/matches.rs:159:18
--> $DIR/matches.rs:100:18
|
159 | Ok(3) => println!("ok"),
100 | Ok(3) => println!("ok"),
| ^^^^^^^^^^^^^^
= note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)

error: this `match` has identical arm bodies
--> $DIR/matches.rs:167:18
--> $DIR/matches.rs:108:18
|
167 | Ok(_) => println!("ok"),
108 | Ok(_) => println!("ok"),
| ^^^^^^^^^^^^^^
|
note: same as this
--> $DIR/matches.rs:166:18
--> $DIR/matches.rs:107:18
|
166 | Ok(3) => println!("ok"),
107 | Ok(3) => println!("ok"),
| ^^^^^^^^^^^^^^
note: consider refactoring into `Ok(3) | Ok(_)`
--> $DIR/matches.rs:166:18
--> $DIR/matches.rs:107:18
|
166 | Ok(3) => println!("ok"),
107 | Ok(3) => println!("ok"),
| ^^^^^^^^^^^^^^
= note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)

error: this `match` has identical arm bodies
--> $DIR/matches.rs:173:18
--> $DIR/matches.rs:114:18
|
173 | Ok(_) => println!("ok"),
114 | Ok(_) => println!("ok"),
| ^^^^^^^^^^^^^^
|
note: same as this
--> $DIR/matches.rs:172:18
--> $DIR/matches.rs:113:18
|
172 | Ok(3) => println!("ok"),
113 | Ok(3) => println!("ok"),
| ^^^^^^^^^^^^^^
note: consider refactoring into `Ok(3) | Ok(_)`
--> $DIR/matches.rs:172:18
--> $DIR/matches.rs:113:18
|
172 | Ok(3) => println!("ok"),
113 | Ok(3) => println!("ok"),
| ^^^^^^^^^^^^^^
= note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)

error: this `match` has identical arm bodies
--> $DIR/matches.rs:179:18
--> $DIR/matches.rs:120:18
|
179 | Ok(_) => println!("ok"),
120 | Ok(_) => println!("ok"),
| ^^^^^^^^^^^^^^
|
note: same as this
--> $DIR/matches.rs:178:18
--> $DIR/matches.rs:119:18
|
178 | Ok(3) => println!("ok"),
119 | Ok(3) => println!("ok"),
| ^^^^^^^^^^^^^^
note: consider refactoring into `Ok(3) | Ok(_)`
--> $DIR/matches.rs:178:18
--> $DIR/matches.rs:119:18
|
178 | Ok(3) => println!("ok"),
119 | Ok(3) => println!("ok"),
| ^^^^^^^^^^^^^^
= note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)

error: this `match` has identical arm bodies
--> $DIR/matches.rs:200:29
--> $DIR/matches.rs:141:29
|
200 | (Ok(_), Some(x)) => println!("ok {}", x),
141 | (Ok(_), Some(x)) => println!("ok {}", x),
| ^^^^^^^^^^^^^^^^^^^^
|
note: same as this
--> $DIR/matches.rs:199:29
--> $DIR/matches.rs:140:29
|
199 | (Ok(x), Some(_)) => println!("ok {}", x),
140 | (Ok(x), Some(_)) => println!("ok {}", x),
| ^^^^^^^^^^^^^^^^^^^^
note: consider refactoring into `(Ok(x), Some(_)) | (Ok(_), Some(x))`
--> $DIR/matches.rs:199:29
--> $DIR/matches.rs:140:29
|
199 | (Ok(x), Some(_)) => println!("ok {}", x),
140 | (Ok(x), Some(_)) => println!("ok {}", x),
| ^^^^^^^^^^^^^^^^^^^^
= note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)

error: this `match` has identical arm bodies
--> $DIR/matches.rs:215:18
--> $DIR/matches.rs:156:18
|
215 | Ok(_) => println!("ok"),
156 | Ok(_) => println!("ok"),
| ^^^^^^^^^^^^^^
|
note: same as this
--> $DIR/matches.rs:214:18
--> $DIR/matches.rs:155:18
|
214 | Ok(3) => println!("ok"),
155 | Ok(3) => println!("ok"),
| ^^^^^^^^^^^^^^
note: consider refactoring into `Ok(3) | Ok(_)`
--> $DIR/matches.rs:214:18
--> $DIR/matches.rs:155:18
|
214 | Ok(3) => println!("ok"),
155 | Ok(3) => println!("ok"),
| ^^^^^^^^^^^^^^
= note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)

error: use as_ref() instead
--> $DIR/matches.rs:222:33
--> $DIR/matches.rs:163:33
|
222 | let borrowed: Option<&()> = match owned {
163 | let borrowed: Option<&()> = match owned {
| _________________________________^
223 | | None => None,
224 | | Some(ref v) => Some(v),
225 | | };
164 | | None => None,
165 | | Some(ref v) => Some(v),
166 | | };
| |_____^ help: try this: `owned.as_ref()`
|
= note: `-D clippy::match-as-ref` implied by `-D warnings`

error: use as_mut() instead
--> $DIR/matches.rs:228:39
--> $DIR/matches.rs:169:39
|
228 | let borrow_mut: Option<&mut ()> = match mut_owned {
169 | let borrow_mut: Option<&mut ()> = match mut_owned {
| _______________________________________^
229 | | None => None,
230 | | Some(ref mut v) => Some(v),
231 | | };
170 | | None => None,
171 | | Some(ref mut v) => Some(v),
172 | | };
| |_____^ help: try this: `mut_owned.as_mut()`

error: aborting due to 26 previous errors
error: aborting due to 21 previous errors