Skip to content

Commit 6956774

Browse files
committed
Auto merge of #142644 - jhpratt:rollup-f2jed9t, r=jhpratt
Rollup of 14 pull requests Successful merges: - rust-lang/rust#141574 (impl `Default` for `array::IntoIter`) - rust-lang/rust#141608 (Add support for repetition to `proc_macro::quote`) - rust-lang/rust#142100 (rustdoc: make srcIndex no longer a global variable) - rust-lang/rust#142371 (avoid `&mut P<T>` in `visit_expr` etc methods) - rust-lang/rust#142517 (Windows: Use anonymous pipes in Command) - rust-lang/rust#142520 (alloc: less static mut + some cleanup) - rust-lang/rust#142588 (Generic ctx imprv) - rust-lang/rust#142605 (Don't unwrap in enzyme builds in case of missing llvm-config) - rust-lang/rust#142608 (Refresh module-level docs for `rustc_target::spec`) - rust-lang/rust#142618 (Lint about `console` calls in rustdoc JS) - rust-lang/rust#142620 (Remove a panicking branch in `BorrowedCursor::advance`) - rust-lang/rust#142631 (Dont suggest remove semi inside macro expansion for redundant semi lint) - rust-lang/rust#142632 (Update cargo) - rust-lang/rust#142635 (Temporarily add back -Zwasm-c-abi=spec) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 3874c95 + c89f473 commit 6956774

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

clippy_lints/src/unnested_or_patterns.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ fn remove_all_parens(pat: &mut P<Pat>) {
128128
}
129129

130130
impl MutVisitor for Visitor {
131-
fn visit_pat(&mut self, pat: &mut P<Pat>) {
131+
fn visit_pat(&mut self, pat: &mut Pat) {
132132
let is_inner = mem::replace(&mut self.is_inner, true);
133133
walk_pat(self, pat);
134134
let inner = match &mut pat.kind {
@@ -145,7 +145,7 @@ fn remove_all_parens(pat: &mut P<Pat>) {
145145
fn insert_necessary_parens(pat: &mut P<Pat>) {
146146
struct Visitor;
147147
impl MutVisitor for Visitor {
148-
fn visit_pat(&mut self, pat: &mut P<Pat>) {
148+
fn visit_pat(&mut self, pat: &mut Pat) {
149149
use ast::BindingMode;
150150
walk_pat(self, pat);
151151
let target = match &mut pat.kind {
@@ -167,7 +167,7 @@ fn unnest_or_patterns(pat: &mut P<Pat>) -> bool {
167167
changed: bool,
168168
}
169169
impl MutVisitor for Visitor {
170-
fn visit_pat(&mut self, p: &mut P<Pat>) {
170+
fn visit_pat(&mut self, p: &mut Pat) {
171171
// This is a bottom up transformation, so recurse first.
172172
walk_pat(self, p);
173173

0 commit comments

Comments
 (0)