diff options
| author | bors <bors@rust-lang.org> | 2024-07-24 09:36:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-07-24 09:36:57 +0000 |
| commit | 6d674685ae4e9156dbb6ecd3aa38d87864ecab3e (patch) | |
| tree | 6d9fb48ad8a93dd839e63dc75b5145b7393e2703 | |
| parent | e2a7000b6bd9244c8f6b30a5d83653f5445393ee (diff) | |
| parent | 221ac86e09d8a4eaeb1997b0743de4736b789266 (diff) | |
| download | rust-6d674685ae4e9156dbb6ecd3aa38d87864ecab3e.tar.gz rust-6d674685ae4e9156dbb6ecd3aa38d87864ecab3e.zip | |
Auto merge of #127524 - oli-obk:feed_item_attrs2, r=petrochenkov
Make ast `MutVisitor` have the same method name and style as `Visitor` It doesn't map 100% because some `MutVisitor` methods can filter or even expand to multiple items, but consistency seems nicer. tracking issue: https://github.com/rust-lang/rust/issues/127615
| -rw-r--r-- | clippy_lints/src/unnested_or_patterns.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/clippy_lints/src/unnested_or_patterns.rs b/clippy_lints/src/unnested_or_patterns.rs index fcc41b51542..842046c941d 100644 --- a/clippy_lints/src/unnested_or_patterns.rs +++ b/clippy_lints/src/unnested_or_patterns.rs @@ -121,7 +121,7 @@ fn remove_all_parens(pat: &mut P<Pat>) { struct Visitor; impl MutVisitor for Visitor { fn visit_pat(&mut self, pat: &mut P<Pat>) { - noop_visit_pat(pat, self); + walk_pat(self, pat); let inner = match &mut pat.kind { Paren(i) => mem::replace(&mut i.kind, Wild), _ => return, @@ -138,7 +138,7 @@ fn insert_necessary_parens(pat: &mut P<Pat>) { impl MutVisitor for Visitor { fn visit_pat(&mut self, pat: &mut P<Pat>) { use ast::BindingMode; - noop_visit_pat(pat, self); + walk_pat(self, pat); let target = match &mut pat.kind { // `i @ a | b`, `box a | b`, and `& mut? a | b`. Ident(.., Some(p)) | Box(p) | Ref(p, _) if matches!(&p.kind, Or(ps) if ps.len() > 1) => p, @@ -160,7 +160,7 @@ fn unnest_or_patterns(pat: &mut P<Pat>) -> bool { impl MutVisitor for Visitor { fn visit_pat(&mut self, p: &mut P<Pat>) { // This is a bottom up transformation, so recurse first. - noop_visit_pat(p, self); + walk_pat(self, p); // Don't have an or-pattern? Just quit early on. let Or(alternatives) = &mut p.kind else { return }; @@ -189,7 +189,7 @@ fn unnest_or_patterns(pat: &mut P<Pat>) -> bool { // Deal with `Some(Some(0)) | Some(Some(1))`. if this_level_changed { - noop_visit_pat(p, self); + walk_pat(self, p); } } } |
