diff options
| author | Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de> | 2024-07-17 11:23:35 +0000 |
|---|---|---|
| committer | Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de> | 2024-07-22 14:01:24 +0000 |
| commit | 221ac86e09d8a4eaeb1997b0743de4736b789266 (patch) | |
| tree | c5f187bb4d1f414e61bfd5f091992d9670e883be | |
| parent | 3149037b57c324a7559e3bb702534433a6974e26 (diff) | |
| download | rust-221ac86e09d8a4eaeb1997b0743de4736b789266.tar.gz rust-221ac86e09d8a4eaeb1997b0743de4736b789266.zip | |
Always pass the visitor as the first argument to walk* functions
| -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 1e6b5c1c7f1..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>) { - walk_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; - walk_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. - walk_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 { - walk_pat(p, self); + walk_pat(self, p); } } } |
