mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clippy_lint: Allow 'ref_option_ref' for 'option_if_let_else'

Browse Source
This commit is contained in:
dvermd 2020-10-13 22:47:46 +02:00
parent c1f3bab6b1
commit bdd76a9d1c
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/ui/option_if_let_else.fixed
View File

@ -1,6 +1,7 @@
// run-rustfix // run-rustfix
#![warn(clippy::option_if_let_else)] #![warn(clippy::option_if_let_else)]
#![allow(clippy::redundant_closure)] #![allow(clippy::redundant_closure)]
#![allow(clippy::ref_option_ref)]
fn bad1(string: Option<&str>) -> (bool, &str) { fn bad1(string: Option<&str>) -> (bool, &str) {
string.map_or((false, "hello"), |x| (true, x)) string.map_or((false, "hello"), |x| (true, x))

1
tests/ui/option_if_let_else.rs
View File

@ -1,6 +1,7 @@
// run-rustfix // run-rustfix
#![warn(clippy::option_if_let_else)] #![warn(clippy::option_if_let_else)]
#![allow(clippy::redundant_closure)] #![allow(clippy::redundant_closure)]
#![allow(clippy::ref_option_ref)]
fn bad1(string: Option<&str>) -> (bool, &str) { fn bad1(string: Option<&str>) -> (bool, &str) {
if let Some(x) = string { if let Some(x) = string {

24
tests/ui/option_if_let_else.stderr
View File

@ -1,5 +1,5 @@
error: use Option::map_or instead of an if let/else error: use Option::map_or instead of an if let/else
--> $DIR/option_if_let_else.rs:6:5 --> $DIR/option_if_let_else.rs:7:5
| |
LL | / if let Some(x) = string { LL | / if let Some(x) = string {
LL | | (true, x) LL | | (true, x)
@ -11,7 +11,7 @@ LL | | }
= note: `-D clippy::option-if-let-else` implied by `-D warnings` = note: `-D clippy::option-if-let-else` implied by `-D warnings`
error: use Option::map_or instead of an if let/else error: use Option::map_or instead of an if let/else
--> $DIR/option_if_let_else.rs:16:12 --> $DIR/option_if_let_else.rs:17:12
| |
LL | } else if let Some(x) = string { LL | } else if let Some(x) = string {
| ____________^ | ____________^
@ -22,19 +22,19 @@ LL | | }
| |_____^ help: try: `{ string.map_or(Some((false, "")), |x| Some((true, x))) }` | |_____^ help: try: `{ string.map_or(Some((false, "")), |x| Some((true, x))) }`
error: use Option::map_or instead of an if let/else error: use Option::map_or instead of an if let/else
--> $DIR/option_if_let_else.rs:24:13 --> $DIR/option_if_let_else.rs:25:13
| |
LL | let _ = if let Some(s) = *string { s.len() } else { 0 }; LL | let _ = if let Some(s) = *string { s.len() } else { 0 };
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `string.map_or(0, |s| s.len())` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `string.map_or(0, |s| s.len())`
error: use Option::map_or instead of an if let/else error: use Option::map_or instead of an if let/else
--> $DIR/option_if_let_else.rs:25:13 --> $DIR/option_if_let_else.rs:26:13
| |
LL | let _ = if let Some(s) = &num { s } else { &0 }; LL | let _ = if let Some(s) = &num { s } else { &0 };
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `num.as_ref().map_or(&0, |s| s)` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `num.as_ref().map_or(&0, |s| s)`
error: use Option::map_or instead of an if let/else error: use Option::map_or instead of an if let/else
--> $DIR/option_if_let_else.rs:26:13 --> $DIR/option_if_let_else.rs:27:13
| |
LL | let _ = if let Some(s) = &mut num { LL | let _ = if let Some(s) = &mut num {
| _____________^ | _____________^
@ -54,13 +54,13 @@ LL | });
| |
error: use Option::map_or instead of an if let/else error: use Option::map_or instead of an if let/else
--> $DIR/option_if_let_else.rs:32:13 --> $DIR/option_if_let_else.rs:33:13
| |
LL | let _ = if let Some(ref s) = num { s } else { &0 }; LL | let _ = if let Some(ref s) = num { s } else { &0 };
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `num.as_ref().map_or(&0, |s| s)` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `num.as_ref().map_or(&0, |s| s)`
error: use Option::map_or instead of an if let/else error: use Option::map_or instead of an if let/else
--> $DIR/option_if_let_else.rs:33:13 --> $DIR/option_if_let_else.rs:34:13
| |
LL | let _ = if let Some(mut s) = num { LL | let _ = if let Some(mut s) = num {
| _____________^ | _____________^
@ -80,7 +80,7 @@ LL | });
| |
error: use Option::map_or instead of an if let/else error: use Option::map_or instead of an if let/else
--> $DIR/option_if_let_else.rs:39:13 --> $DIR/option_if_let_else.rs:40:13
| |
LL | let _ = if let Some(ref mut s) = num { LL | let _ = if let Some(ref mut s) = num {
| _____________^ | _____________^
@ -100,7 +100,7 @@ LL | });
| |
error: use Option::map_or instead of an if let/else error: use Option::map_or instead of an if let/else
--> $DIR/option_if_let_else.rs:48:5 --> $DIR/option_if_let_else.rs:49:5
| |
LL | / if let Some(x) = arg { LL | / if let Some(x) = arg {
LL | | let y = x * x; LL | | let y = x * x;
@ -119,7 +119,7 @@ LL | })
| |
error: use Option::map_or_else instead of an if let/else error: use Option::map_or_else instead of an if let/else
--> $DIR/option_if_let_else.rs:61:13 --> $DIR/option_if_let_else.rs:62:13
| |
LL | let _ = if let Some(x) = arg { LL | let _ = if let Some(x) = arg {
| _____________^ | _____________^
@ -131,7 +131,7 @@ LL | | };
| |_____^ help: try: `arg.map_or_else(|| side_effect(), |x| x)` | |_____^ help: try: `arg.map_or_else(|| side_effect(), |x| x)`
error: use Option::map_or_else instead of an if let/else error: use Option::map_or_else instead of an if let/else
--> $DIR/option_if_let_else.rs:70:13 --> $DIR/option_if_let_else.rs:71:13
| |
LL | let _ = if let Some(x) = arg { LL | let _ = if let Some(x) = arg {
| _____________^ | _____________^
@ -154,7 +154,7 @@ LL | }, |x| x * x * x * x);
| |
error: use Option::map_or instead of an if let/else error: use Option::map_or instead of an if let/else
--> $DIR/option_if_let_else.rs:99:13 --> $DIR/option_if_let_else.rs:100:13
| |
LL | let _ = if let Some(x) = optional { x + 2 } else { 5 }; LL | let _ = if let Some(x) = optional { x + 2 } else { 5 };
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `optional.map_or(5, |x| x + 2)` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `optional.map_or(5, |x| x + 2)`