From 4117ae1175430087441c9b34145f148d49c2f08c Mon Sep 17 00:00:00 2001
From: Eduardo Broto <ebroto@tutanota.com>
Date: Mon, 21 Sep 2020 15:32:26 +0200
Subject: [PATCH] Split redundant_pattern_matching tests
This is to avoid the 200 lines stderr file limit
---
tests/ui/redundant_pattern_matching.fixed | 71 +------
tests/ui/redundant_pattern_matching.rs | 86 +--------
tests/ui/redundant_pattern_matching.stderr | 174 +++---------------
.../redundant_pattern_matching_option.fixed | 85 +++++++++
tests/ui/redundant_pattern_matching_option.rs | 100 ++++++++++
.../redundant_pattern_matching_option.stderr | 134 ++++++++++++++
6 files changed, 351 insertions(+), 299 deletions(-)
create mode 100644 tests/ui/redundant_pattern_matching_option.fixed
create mode 100644 tests/ui/redundant_pattern_matching_option.rs
create mode 100644 tests/ui/redundant_pattern_matching_option.stderr
diff --git a/tests/ui/redundant_pattern_matching.fixed b/tests/ui/redundant_pattern_matching.fixed
index 8084fdefdc2..17d908336d5 100644
--- a/tests/ui/redundant_pattern_matching.fixed
+++ b/tests/ui/redundant_pattern_matching.fixed
@@ -18,39 +18,14 @@ fn main() {
if Err::<i32, i32>(42).is_err() {}
- if None::<()>.is_none() {}
-
- if Some(42).is_some() {}
-
- if Some(42).is_some() {
- foo();
- } else {
- bar();
- }
-
- while Some(42).is_some() {}
-
- while Some(42).is_none() {}
-
- while None::<()>.is_none() {}
-
while Ok::<i32, i32>(10).is_ok() {}
while Ok::<i32, i32>(10).is_err() {}
- let mut v = vec![1, 2, 3];
- while v.pop().is_some() {
- foo();
- }
-
if Ok::<i32, i32>(42).is_ok() {}
if Err::<i32, i32>(42).is_err() {}
- if None::<i32>.is_none() {}
-
- if Some(42).is_some() {}
-
if let Ok(x) = Ok::<i32, i32>(42) {
println!("{}", x);
}
@@ -63,48 +38,24 @@ fn main() {
Err::<i32, i32>(42).is_ok();
- Some(42).is_some();
-
- None::<()>.is_none();
-
- let _ = None::<()>.is_none();
-
let _ = if Ok::<usize, ()>(4).is_ok() { true } else { false };
- let opt = Some(false);
- let x = if opt.is_some() { true } else { false };
- takes_bool(x);
-
issue5504();
issue6067();
- let _ = if gen_opt().is_some() {
+ let _ = if gen_res().is_ok() {
1
- } else if gen_opt().is_none() {
- 2
- } else if gen_res().is_ok() {
- 3
} else if gen_res().is_err() {
- 4
+ 2
} else {
- 5
+ 3
};
}
-fn gen_opt() -> Option<()> {
- None
-}
-
fn gen_res() -> Result<(), ()> {
Ok(())
}
-fn takes_bool(_: bool) {}
-
-fn foo() {}
-
-fn bar() {}
-
macro_rules! m {
() => {
Some(42u32)
@@ -129,30 +80,18 @@ fn issue5504() {
}
// Methods that are unstable const should not be suggested within a const context, see issue #5697.
-// However, in Rust 1.48.0 the methods `is_ok` and `is_err` of `Result`, and `is_some` and `is_none`
-// of `Option` were stabilized as const, so the following should be linted.
+// However, in Rust 1.48.0 the methods `is_ok` and `is_err` of `Result` were stabilized as const,
+// so the following should be linted.
const fn issue6067() {
if Ok::<i32, i32>(42).is_ok() {}
if Err::<i32, i32>(42).is_err() {}
- if Some(42).is_some() {}
-
- if None::<()>.is_none() {}
-
while Ok::<i32, i32>(10).is_ok() {}
while Ok::<i32, i32>(10).is_err() {}
- while Some(42).is_some() {}
-
- while None::<()>.is_none() {}
-
Ok::<i32, i32>(42).is_ok();
Err::<i32, i32>(42).is_err();
-
- Some(42).is_some();
-
- None::<()>.is_none();
}
diff --git a/tests/ui/redundant_pattern_matching.rs b/tests/ui/redundant_pattern_matching.rs
index 48a32cb1c7b..d57fbb14ae4 100644
--- a/tests/ui/redundant_pattern_matching.rs
+++ b/tests/ui/redundant_pattern_matching.rs
@@ -18,39 +18,14 @@ fn main() {
if let Err(_) = Err::<i32, i32>(42) {}
- if let None = None::<()> {}
-
- if let Some(_) = Some(42) {}
-
- if let Some(_) = Some(42) {
- foo();
- } else {
- bar();
- }
-
- while let Some(_) = Some(42) {}
-
- while let None = Some(42) {}
-
- while let None = None::<()> {}
-
while let Ok(_) = Ok::<i32, i32>(10) {}
while let Err(_) = Ok::<i32, i32>(10) {}
- let mut v = vec![1, 2, 3];
- while let Some(_) = v.pop() {
- foo();
- }
-
if Ok::<i32, i32>(42).is_ok() {}
if Err::<i32, i32>(42).is_err() {}
- if None::<i32>.is_none() {}
-
- if Some(42).is_some() {}
-
if let Ok(x) = Ok::<i32, i32>(42) {
println!("{}", x);
}
@@ -75,57 +50,24 @@ fn main() {
Err(_) => false,
};
- match Some(42) {
- Some(_) => true,
- None => false,
- };
-
- match None::<()> {
- Some(_) => false,
- None => true,
- };
-
- let _ = match None::<()> {
- Some(_) => false,
- None => true,
- };
-
let _ = if let Ok(_) = Ok::<usize, ()>(4) { true } else { false };
- let opt = Some(false);
- let x = if let Some(_) = opt { true } else { false };
- takes_bool(x);
-
issue5504();
issue6067();
- let _ = if let Some(_) = gen_opt() {
+ let _ = if let Ok(_) = gen_res() {
1
- } else if let None = gen_opt() {
- 2
- } else if let Ok(_) = gen_res() {
- 3
} else if let Err(_) = gen_res() {
- 4
+ 2
} else {
- 5
+ 3
};
}
-fn gen_opt() -> Option<()> {
- None
-}
-
fn gen_res() -> Result<(), ()> {
Ok(())
}
-fn takes_bool(_: bool) {}
-
-fn foo() {}
-
-fn bar() {}
-
macro_rules! m {
() => {
Some(42u32)
@@ -150,25 +92,17 @@ fn issue5504() {
}
// Methods that are unstable const should not be suggested within a const context, see issue #5697.
-// However, in Rust 1.48.0 the methods `is_ok` and `is_err` of `Result`, and `is_some` and `is_none`
-// of `Option` were stabilized as const, so the following should be linted.
+// However, in Rust 1.48.0 the methods `is_ok` and `is_err` of `Result` were stabilized as const,
+// so the following should be linted.
const fn issue6067() {
if let Ok(_) = Ok::<i32, i32>(42) {}
if let Err(_) = Err::<i32, i32>(42) {}
- if let Some(_) = Some(42) {}
-
- if let None = None::<()> {}
-
while let Ok(_) = Ok::<i32, i32>(10) {}
while let Err(_) = Ok::<i32, i32>(10) {}
- while let Some(_) = Some(42) {}
-
- while let None = None::<()> {}
-
match Ok::<i32, i32>(42) {
Ok(_) => true,
Err(_) => false,
@@ -178,14 +112,4 @@ const fn issue6067() {
Ok(_) => false,
Err(_) => true,
};
-
- match Some(42) {
- Some(_) => true,
- None => false,
- };
-
- match None::<()> {
- Some(_) => false,
- None => true,
- };
}
diff --git a/tests/ui/redundant_pattern_matching.stderr b/tests/ui/redundant_pattern_matching.stderr
index 17185217e89..955900f3e6c 100644
--- a/tests/ui/redundant_pattern_matching.stderr
+++ b/tests/ui/redundant_pattern_matching.stderr
@@ -18,62 +18,20 @@ error: redundant pattern matching, consider using `is_err()`
LL | if let Err(_) = Err::<i32, i32>(42) {}
| -------^^^^^^---------------------- help: try this: `if Err::<i32, i32>(42).is_err()`
-error: redundant pattern matching, consider using `is_none()`
- --> $DIR/redundant_pattern_matching.rs:21:12
- |
-LL | if let None = None::<()> {}
- | -------^^^^------------- help: try this: `if None::<()>.is_none()`
-
-error: redundant pattern matching, consider using `is_some()`
- --> $DIR/redundant_pattern_matching.rs:23:12
- |
-LL | if let Some(_) = Some(42) {}
- | -------^^^^^^^----------- help: try this: `if Some(42).is_some()`
-
-error: redundant pattern matching, consider using `is_some()`
- --> $DIR/redundant_pattern_matching.rs:25:12
- |
-LL | if let Some(_) = Some(42) {
- | -------^^^^^^^----------- help: try this: `if Some(42).is_some()`
-
-error: redundant pattern matching, consider using `is_some()`
- --> $DIR/redundant_pattern_matching.rs:31:15
- |
-LL | while let Some(_) = Some(42) {}
- | ----------^^^^^^^----------- help: try this: `while Some(42).is_some()`
-
-error: redundant pattern matching, consider using `is_none()`
- --> $DIR/redundant_pattern_matching.rs:33:15
- |
-LL | while let None = Some(42) {}
- | ----------^^^^----------- help: try this: `while Some(42).is_none()`
-
-error: redundant pattern matching, consider using `is_none()`
- --> $DIR/redundant_pattern_matching.rs:35:15
- |
-LL | while let None = None::<()> {}
- | ----------^^^^------------- help: try this: `while None::<()>.is_none()`
-
error: redundant pattern matching, consider using `is_ok()`
- --> $DIR/redundant_pattern_matching.rs:37:15
+ --> $DIR/redundant_pattern_matching.rs:21:15
|
LL | while let Ok(_) = Ok::<i32, i32>(10) {}
| ----------^^^^^--------------------- help: try this: `while Ok::<i32, i32>(10).is_ok()`
error: redundant pattern matching, consider using `is_err()`
- --> $DIR/redundant_pattern_matching.rs:39:15
+ --> $DIR/redundant_pattern_matching.rs:23:15
|
LL | while let Err(_) = Ok::<i32, i32>(10) {}
| ----------^^^^^^--------------------- help: try this: `while Ok::<i32, i32>(10).is_err()`
-error: redundant pattern matching, consider using `is_some()`
- --> $DIR/redundant_pattern_matching.rs:42:15
- |
-LL | while let Some(_) = v.pop() {
- | ----------^^^^^^^---------- help: try this: `while v.pop().is_some()`
-
error: redundant pattern matching, consider using `is_ok()`
- --> $DIR/redundant_pattern_matching.rs:58:5
+ --> $DIR/redundant_pattern_matching.rs:33:5
|
LL | / match Ok::<i32, i32>(42) {
LL | | Ok(_) => true,
@@ -82,7 +40,7 @@ LL | | };
| |_____^ help: try this: `Ok::<i32, i32>(42).is_ok()`
error: redundant pattern matching, consider using `is_err()`
- --> $DIR/redundant_pattern_matching.rs:63:5
+ --> $DIR/redundant_pattern_matching.rs:38:5
|
LL | / match Ok::<i32, i32>(42) {
LL | | Ok(_) => false,
@@ -91,7 +49,7 @@ LL | | };
| |_____^ help: try this: `Ok::<i32, i32>(42).is_err()`
error: redundant pattern matching, consider using `is_err()`
- --> $DIR/redundant_pattern_matching.rs:68:5
+ --> $DIR/redundant_pattern_matching.rs:43:5
|
LL | / match Err::<i32, i32>(42) {
LL | | Ok(_) => false,
@@ -100,7 +58,7 @@ LL | | };
| |_____^ help: try this: `Err::<i32, i32>(42).is_err()`
error: redundant pattern matching, consider using `is_ok()`
- --> $DIR/redundant_pattern_matching.rs:73:5
+ --> $DIR/redundant_pattern_matching.rs:48:5
|
LL | / match Err::<i32, i32>(42) {
LL | | Ok(_) => true,
@@ -108,144 +66,74 @@ LL | | Err(_) => false,
LL | | };
| |_____^ help: try this: `Err::<i32, i32>(42).is_ok()`
-error: redundant pattern matching, consider using `is_some()`
- --> $DIR/redundant_pattern_matching.rs:78:5
- |
-LL | / match Some(42) {
-LL | | Some(_) => true,
-LL | | None => false,
-LL | | };
- | |_____^ help: try this: `Some(42).is_some()`
-
-error: redundant pattern matching, consider using `is_none()`
- --> $DIR/redundant_pattern_matching.rs:83:5
- |
-LL | / match None::<()> {
-LL | | Some(_) => false,
-LL | | None => true,
-LL | | };
- | |_____^ help: try this: `None::<()>.is_none()`
-
-error: redundant pattern matching, consider using `is_none()`
- --> $DIR/redundant_pattern_matching.rs:88:13
- |
-LL | let _ = match None::<()> {
- | _____________^
-LL | | Some(_) => false,
-LL | | None => true,
-LL | | };
- | |_____^ help: try this: `None::<()>.is_none()`
-
error: redundant pattern matching, consider using `is_ok()`
- --> $DIR/redundant_pattern_matching.rs:93:20
+ --> $DIR/redundant_pattern_matching.rs:53:20
|
LL | let _ = if let Ok(_) = Ok::<usize, ()>(4) { true } else { false };
| -------^^^^^--------------------- help: try this: `if Ok::<usize, ()>(4).is_ok()`
-error: redundant pattern matching, consider using `is_some()`
- --> $DIR/redundant_pattern_matching.rs:96:20
- |
-LL | let x = if let Some(_) = opt { true } else { false };
- | -------^^^^^^^------ help: try this: `if opt.is_some()`
-
-error: redundant pattern matching, consider using `is_some()`
- --> $DIR/redundant_pattern_matching.rs:102:20
- |
-LL | let _ = if let Some(_) = gen_opt() {
- | -------^^^^^^^------------ help: try this: `if gen_opt().is_some()`
-
-error: redundant pattern matching, consider using `is_none()`
- --> $DIR/redundant_pattern_matching.rs:104:19
- |
-LL | } else if let None = gen_opt() {
- | -------^^^^------------ help: try this: `if gen_opt().is_none()`
-
error: redundant pattern matching, consider using `is_ok()`
- --> $DIR/redundant_pattern_matching.rs:106:19
+ --> $DIR/redundant_pattern_matching.rs:58:20
|
-LL | } else if let Ok(_) = gen_res() {
- | -------^^^^^------------ help: try this: `if gen_res().is_ok()`
+LL | let _ = if let Ok(_) = gen_res() {
+ | -------^^^^^------------ help: try this: `if gen_res().is_ok()`
error: redundant pattern matching, consider using `is_err()`
- --> $DIR/redundant_pattern_matching.rs:108:19
+ --> $DIR/redundant_pattern_matching.rs:60:19
|
LL | } else if let Err(_) = gen_res() {
| -------^^^^^^------------ help: try this: `if gen_res().is_err()`
error: redundant pattern matching, consider using `is_some()`
- --> $DIR/redundant_pattern_matching.rs:141:19
+ --> $DIR/redundant_pattern_matching.rs:83:19
|
LL | while let Some(_) = r#try!(result_opt()) {}
| ----------^^^^^^^----------------------- help: try this: `while r#try!(result_opt()).is_some()`
error: redundant pattern matching, consider using `is_some()`
- --> $DIR/redundant_pattern_matching.rs:142:16
+ --> $DIR/redundant_pattern_matching.rs:84:16
|
LL | if let Some(_) = r#try!(result_opt()) {}
| -------^^^^^^^----------------------- help: try this: `if r#try!(result_opt()).is_some()`
error: redundant pattern matching, consider using `is_some()`
- --> $DIR/redundant_pattern_matching.rs:148:12
+ --> $DIR/redundant_pattern_matching.rs:90:12
|
LL | if let Some(_) = m!() {}
| -------^^^^^^^------- help: try this: `if m!().is_some()`
error: redundant pattern matching, consider using `is_some()`
- --> $DIR/redundant_pattern_matching.rs:149:15
+ --> $DIR/redundant_pattern_matching.rs:91:15
|
LL | while let Some(_) = m!() {}
| ----------^^^^^^^------- help: try this: `while m!().is_some()`
error: redundant pattern matching, consider using `is_ok()`
- --> $DIR/redundant_pattern_matching.rs:156:12
+ --> $DIR/redundant_pattern_matching.rs:98:12
|
LL | if let Ok(_) = Ok::<i32, i32>(42) {}
| -------^^^^^--------------------- help: try this: `if Ok::<i32, i32>(42).is_ok()`
error: redundant pattern matching, consider using `is_err()`
- --> $DIR/redundant_pattern_matching.rs:158:12
+ --> $DIR/redundant_pattern_matching.rs:100:12
|
LL | if let Err(_) = Err::<i32, i32>(42) {}
| -------^^^^^^---------------------- help: try this: `if Err::<i32, i32>(42).is_err()`
-error: redundant pattern matching, consider using `is_some()`
- --> $DIR/redundant_pattern_matching.rs:160:12
- |
-LL | if let Some(_) = Some(42) {}
- | -------^^^^^^^----------- help: try this: `if Some(42).is_some()`
-
-error: redundant pattern matching, consider using `is_none()`
- --> $DIR/redundant_pattern_matching.rs:162:12
- |
-LL | if let None = None::<()> {}
- | -------^^^^------------- help: try this: `if None::<()>.is_none()`
-
error: redundant pattern matching, consider using `is_ok()`
- --> $DIR/redundant_pattern_matching.rs:164:15
+ --> $DIR/redundant_pattern_matching.rs:102:15
|
LL | while let Ok(_) = Ok::<i32, i32>(10) {}
| ----------^^^^^--------------------- help: try this: `while Ok::<i32, i32>(10).is_ok()`
error: redundant pattern matching, consider using `is_err()`
- --> $DIR/redundant_pattern_matching.rs:166:15
+ --> $DIR/redundant_pattern_matching.rs:104:15
|
LL | while let Err(_) = Ok::<i32, i32>(10) {}
| ----------^^^^^^--------------------- help: try this: `while Ok::<i32, i32>(10).is_err()`
-error: redundant pattern matching, consider using `is_some()`
- --> $DIR/redundant_pattern_matching.rs:168:15
- |
-LL | while let Some(_) = Some(42) {}
- | ----------^^^^^^^----------- help: try this: `while Some(42).is_some()`
-
-error: redundant pattern matching, consider using `is_none()`
- --> $DIR/redundant_pattern_matching.rs:170:15
- |
-LL | while let None = None::<()> {}
- | ----------^^^^------------- help: try this: `while None::<()>.is_none()`
-
error: redundant pattern matching, consider using `is_ok()`
- --> $DIR/redundant_pattern_matching.rs:172:5
+ --> $DIR/redundant_pattern_matching.rs:106:5
|
LL | / match Ok::<i32, i32>(42) {
LL | | Ok(_) => true,
@@ -254,7 +142,7 @@ LL | | };
| |_____^ help: try this: `Ok::<i32, i32>(42).is_ok()`
error: redundant pattern matching, consider using `is_err()`
- --> $DIR/redundant_pattern_matching.rs:177:5
+ --> $DIR/redundant_pattern_matching.rs:111:5
|
LL | / match Err::<i32, i32>(42) {
LL | | Ok(_) => false,
@@ -262,23 +150,5 @@ LL | | Err(_) => true,
LL | | };
| |_____^ help: try this: `Err::<i32, i32>(42).is_err()`
-error: redundant pattern matching, consider using `is_some()`
- --> $DIR/redundant_pattern_matching.rs:182:5
- |
-LL | / match Some(42) {
-LL | | Some(_) => true,
-LL | | None => false,
-LL | | };
- | |_____^ help: try this: `Some(42).is_some()`
-
-error: redundant pattern matching, consider using `is_none()`
- --> $DIR/redundant_pattern_matching.rs:187:5
- |
-LL | / match None::<()> {
-LL | | Some(_) => false,
-LL | | None => true,
-LL | | };
- | |_____^ help: try this: `None::<()>.is_none()`
-
-error: aborting due to 41 previous errors
+error: aborting due to 22 previous errors
diff --git a/tests/ui/redundant_pattern_matching_option.fixed b/tests/ui/redundant_pattern_matching_option.fixed
new file mode 100644
index 00000000000..499b975b2bb
--- /dev/null
+++ b/tests/ui/redundant_pattern_matching_option.fixed
@@ -0,0 +1,85 @@
+// run-rustfix
+
+#![warn(clippy::all)]
+#![warn(clippy::redundant_pattern_matching)]
+#![allow(
+ clippy::unit_arg,
+ unused_must_use,
+ clippy::needless_bool,
+ clippy::match_like_matches_macro,
+ deprecated
+)]
+
+fn main() {
+ if None::<()>.is_none() {}
+
+ if Some(42).is_some() {}
+
+ if Some(42).is_some() {
+ foo();
+ } else {
+ bar();
+ }
+
+ while Some(42).is_some() {}
+
+ while Some(42).is_none() {}
+
+ while None::<()>.is_none() {}
+
+ let mut v = vec![1, 2, 3];
+ while v.pop().is_some() {
+ foo();
+ }
+
+ if None::<i32>.is_none() {}
+
+ if Some(42).is_some() {}
+
+ Some(42).is_some();
+
+ None::<()>.is_none();
+
+ let _ = None::<()>.is_none();
+
+ let opt = Some(false);
+ let x = if opt.is_some() { true } else { false };
+ takes_bool(x);
+
+ issue6067();
+
+ let _ = if gen_opt().is_some() {
+ 1
+ } else if gen_opt().is_none() {
+ 2
+ } else {
+ 3
+ };
+}
+
+fn gen_opt() -> Option<()> {
+ None
+}
+
+fn takes_bool(_: bool) {}
+
+fn foo() {}
+
+fn bar() {}
+
+// Methods that are unstable const should not be suggested within a const context, see issue #5697.
+// However, in Rust 1.48.0 the methods `is_some` and `is_none` of `Option` were stabilized as const,
+// so the following should be linted.
+const fn issue6067() {
+ if Some(42).is_some() {}
+
+ if None::<()>.is_none() {}
+
+ while Some(42).is_some() {}
+
+ while None::<()>.is_none() {}
+
+ Some(42).is_some();
+
+ None::<()>.is_none();
+}
diff --git a/tests/ui/redundant_pattern_matching_option.rs b/tests/ui/redundant_pattern_matching_option.rs
new file mode 100644
index 00000000000..2a98435e790
--- /dev/null
+++ b/tests/ui/redundant_pattern_matching_option.rs
@@ -0,0 +1,100 @@
+// run-rustfix
+
+#![warn(clippy::all)]
+#![warn(clippy::redundant_pattern_matching)]
+#![allow(
+ clippy::unit_arg,
+ unused_must_use,
+ clippy::needless_bool,
+ clippy::match_like_matches_macro,
+ deprecated
+)]
+
+fn main() {
+ if let None = None::<()> {}
+
+ if let Some(_) = Some(42) {}
+
+ if let Some(_) = Some(42) {
+ foo();
+ } else {
+ bar();
+ }
+
+ while let Some(_) = Some(42) {}
+
+ while let None = Some(42) {}
+
+ while let None = None::<()> {}
+
+ let mut v = vec![1, 2, 3];
+ while let Some(_) = v.pop() {
+ foo();
+ }
+
+ if None::<i32>.is_none() {}
+
+ if Some(42).is_some() {}
+
+ match Some(42) {
+ Some(_) => true,
+ None => false,
+ };
+
+ match None::<()> {
+ Some(_) => false,
+ None => true,
+ };
+
+ let _ = match None::<()> {
+ Some(_) => false,
+ None => true,
+ };
+
+ let opt = Some(false);
+ let x = if let Some(_) = opt { true } else { false };
+ takes_bool(x);
+
+ issue6067();
+
+ let _ = if let Some(_) = gen_opt() {
+ 1
+ } else if let None = gen_opt() {
+ 2
+ } else {
+ 3
+ };
+}
+
+fn gen_opt() -> Option<()> {
+ None
+}
+
+fn takes_bool(_: bool) {}
+
+fn foo() {}
+
+fn bar() {}
+
+// Methods that are unstable const should not be suggested within a const context, see issue #5697.
+// However, in Rust 1.48.0 the methods `is_some` and `is_none` of `Option` were stabilized as const,
+// so the following should be linted.
+const fn issue6067() {
+ if let Some(_) = Some(42) {}
+
+ if let None = None::<()> {}
+
+ while let Some(_) = Some(42) {}
+
+ while let None = None::<()> {}
+
+ match Some(42) {
+ Some(_) => true,
+ None => false,
+ };
+
+ match None::<()> {
+ Some(_) => false,
+ None => true,
+ };
+}
diff --git a/tests/ui/redundant_pattern_matching_option.stderr b/tests/ui/redundant_pattern_matching_option.stderr
new file mode 100644
index 00000000000..eebb3448491
--- /dev/null
+++ b/tests/ui/redundant_pattern_matching_option.stderr
@@ -0,0 +1,134 @@
+error: redundant pattern matching, consider using `is_none()`
+ --> $DIR/redundant_pattern_matching_option.rs:14:12
+ |
+LL | if let None = None::<()> {}
+ | -------^^^^------------- help: try this: `if None::<()>.is_none()`
+ |
+ = note: `-D clippy::redundant-pattern-matching` implied by `-D warnings`
+
+error: redundant pattern matching, consider using `is_some()`
+ --> $DIR/redundant_pattern_matching_option.rs:16:12
+ |
+LL | if let Some(_) = Some(42) {}
+ | -------^^^^^^^----------- help: try this: `if Some(42).is_some()`
+
+error: redundant pattern matching, consider using `is_some()`
+ --> $DIR/redundant_pattern_matching_option.rs:18:12
+ |
+LL | if let Some(_) = Some(42) {
+ | -------^^^^^^^----------- help: try this: `if Some(42).is_some()`
+
+error: redundant pattern matching, consider using `is_some()`
+ --> $DIR/redundant_pattern_matching_option.rs:24:15
+ |
+LL | while let Some(_) = Some(42) {}
+ | ----------^^^^^^^----------- help: try this: `while Some(42).is_some()`
+
+error: redundant pattern matching, consider using `is_none()`
+ --> $DIR/redundant_pattern_matching_option.rs:26:15
+ |
+LL | while let None = Some(42) {}
+ | ----------^^^^----------- help: try this: `while Some(42).is_none()`
+
+error: redundant pattern matching, consider using `is_none()`
+ --> $DIR/redundant_pattern_matching_option.rs:28:15
+ |
+LL | while let None = None::<()> {}
+ | ----------^^^^------------- help: try this: `while None::<()>.is_none()`
+
+error: redundant pattern matching, consider using `is_some()`
+ --> $DIR/redundant_pattern_matching_option.rs:31:15
+ |
+LL | while let Some(_) = v.pop() {
+ | ----------^^^^^^^---------- help: try this: `while v.pop().is_some()`
+
+error: redundant pattern matching, consider using `is_some()`
+ --> $DIR/redundant_pattern_matching_option.rs:39:5
+ |
+LL | / match Some(42) {
+LL | | Some(_) => true,
+LL | | None => false,
+LL | | };
+ | |_____^ help: try this: `Some(42).is_some()`
+
+error: redundant pattern matching, consider using `is_none()`
+ --> $DIR/redundant_pattern_matching_option.rs:44:5
+ |
+LL | / match None::<()> {
+LL | | Some(_) => false,
+LL | | None => true,
+LL | | };
+ | |_____^ help: try this: `None::<()>.is_none()`
+
+error: redundant pattern matching, consider using `is_none()`
+ --> $DIR/redundant_pattern_matching_option.rs:49:13
+ |
+LL | let _ = match None::<()> {
+ | _____________^
+LL | | Some(_) => false,
+LL | | None => true,
+LL | | };
+ | |_____^ help: try this: `None::<()>.is_none()`
+
+error: redundant pattern matching, consider using `is_some()`
+ --> $DIR/redundant_pattern_matching_option.rs:55:20
+ |
+LL | let x = if let Some(_) = opt { true } else { false };
+ | -------^^^^^^^------ help: try this: `if opt.is_some()`
+
+error: redundant pattern matching, consider using `is_some()`
+ --> $DIR/redundant_pattern_matching_option.rs:60:20
+ |
+LL | let _ = if let Some(_) = gen_opt() {
+ | -------^^^^^^^------------ help: try this: `if gen_opt().is_some()`
+
+error: redundant pattern matching, consider using `is_none()`
+ --> $DIR/redundant_pattern_matching_option.rs:62:19
+ |
+LL | } else if let None = gen_opt() {
+ | -------^^^^------------ help: try this: `if gen_opt().is_none()`
+
+error: redundant pattern matching, consider using `is_some()`
+ --> $DIR/redundant_pattern_matching_option.rs:83:12
+ |
+LL | if let Some(_) = Some(42) {}
+ | -------^^^^^^^----------- help: try this: `if Some(42).is_some()`
+
+error: redundant pattern matching, consider using `is_none()`
+ --> $DIR/redundant_pattern_matching_option.rs:85:12
+ |
+LL | if let None = None::<()> {}
+ | -------^^^^------------- help: try this: `if None::<()>.is_none()`
+
+error: redundant pattern matching, consider using `is_some()`
+ --> $DIR/redundant_pattern_matching_option.rs:87:15
+ |
+LL | while let Some(_) = Some(42) {}
+ | ----------^^^^^^^----------- help: try this: `while Some(42).is_some()`
+
+error: redundant pattern matching, consider using `is_none()`
+ --> $DIR/redundant_pattern_matching_option.rs:89:15
+ |
+LL | while let None = None::<()> {}
+ | ----------^^^^------------- help: try this: `while None::<()>.is_none()`
+
+error: redundant pattern matching, consider using `is_some()`
+ --> $DIR/redundant_pattern_matching_option.rs:91:5
+ |
+LL | / match Some(42) {
+LL | | Some(_) => true,
+LL | | None => false,
+LL | | };
+ | |_____^ help: try this: `Some(42).is_some()`
+
+error: redundant pattern matching, consider using `is_none()`
+ --> $DIR/redundant_pattern_matching_option.rs:96:5
+ |
+LL | / match None::<()> {
+LL | | Some(_) => false,
+LL | | None => true,
+LL | | };
+ | |_____^ help: try this: `None::<()>.is_none()`
+
+error: aborting due to 19 previous errors
+