[manual_flatten]: Fix with nested Some or Ok pattern
#14846
Conversation
a-yossy
changed the title
manual_flatten] with nested Some or Ok patternmanual_flatten]: Fix with nested Some or Ok pattern
|
r? @Alexendoo rustbot has assigned @Alexendoo. Use |
rustbot
added
the
S-waiting-on-review
| @@ -39,9 +39,13 @@ pub(super) fn check<'tcx>( | |||
| && msrv.meets(cx, msrvs::ITER_FLATTEN) | |||
| { | |||
| let if_let_type = if some_ctor { "Some" } else { "Ok" }; | |||
| let has_nested_tuple_struct = contains_nested_tuple_struct(pats); | |||
There was a problem hiding this comment.
This would apply to other refutable patterns too so it can use https://doc.rust-lang.org/nightly/nightly-rustc/clippy_utils/fn.is_refutable.html
e.g. if let Some((x, 1)) = y { ... }
tests/ui/manual_flatten.stderr
Outdated
| help: ...and remove the outer `Some` variant in the for loop | ||
| --> tests/ui/manual_flatten.rs:131:9 | ||
| | | ||
| LL | / if let Some((_, Some(n))) = n { | ||
| LL | | println!("{}", n); | ||
| LL | | } | ||
| | |_________^ |
There was a problem hiding this comment.
I think it'd be better to not lint these cases, it doesn't make it shorter or reduce the nesting level
|
Thank you for your review. |
|
Yeah that's great thanks, if you could squash the commits then it looks good to go |
This comment has been minimized.
This comment has been minimized.
rustbot
added
has-merge-commits
rustbot
removed
S-waiting-on-author
|
Thank you for your review. |
changelog: [
manual_flatten]: fix with nestedSomeorOkpatternfixes #6776