Skip to content

Commit 99d6e28

Browse files
committed
Auto merge of #142133 - GuillaumeGomez:rollup-fvzdren, r=GuillaumeGomez
Rollup of 11 pull requests Successful merges: - rust-lang/rust#140418 (Reexport types from `c_size_t` in `std`) - rust-lang/rust#141471 (unsafe keyword docs: emphasize that an unsafe fn in a trait does not get to choose its safety contract) - rust-lang/rust#141603 (Reduce `ast::ptr::P` to a typedef of `Box`) - rust-lang/rust#142043 (Verbose suggestion to make param `const`) - rust-lang/rust#142086 (duduplicate more AST visitor methods) - rust-lang/rust#142103 (Update `InterpCx::project_field` to take `FieldIdx`) - rust-lang/rust#142105 (remove extraneous text) - rust-lang/rust#142112 (fix typo) - rust-lang/rust#142113 (Reduce confusion of some drop order tests) - rust-lang/rust#142114 (Compute number of digits instead of relying on constant value for u128 display code) - rust-lang/rust#142118 (rustc_lexer: typo fix + small cleanups) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 3be03cf + f29b62f commit 99d6e28

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

clippy_lints/src/unnested_or_patterns.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ fn drain_matching(
426426
// Check if we should extract, but only if `idx >= start`.
427427
if idx > start && predicate(&alternatives[i].kind) {
428428
let pat = alternatives.remove(i);
429-
tail_or.push(extract(pat.into_inner().kind));
429+
tail_or.push(extract(pat.kind));
430430
} else {
431431
i += 1;
432432
}

0 commit comments

Comments
 (0)