Skip to content

Commit f77c980

Browse files
committed
Auto merge of rust-lang#154253 - JonathanBrouwer:rollup-LLZUsz2, r=JonathanBrouwer
Rollup of 13 pull requests Successful merges: - rust-lang#154241 (`rust-analyzer` subtree update) - rust-lang#153686 (`std`: include `dlmalloc` for all non-wasi Wasm targets) - rust-lang#154105 (bootstrap: Pass `--features=rustc` to rustc_transmute) - rust-lang#153069 ([BPF] add target feature allows-misaligned-mem-access) - rust-lang#154085 (Parenthesize or-patterns in prefix pattern positions in pretty printer) - rust-lang#154191 (refactor RangeFromIter overflow-checks impl) - rust-lang#154207 (Refactor query loading) - rust-lang#153540 (drop derive helpers during attribute parsing) - rust-lang#154140 (Document consteval behavior of ub_checks, overflow_checks, is_val_statically_known.) - rust-lang#154161 (On E0277 tweak help when single type impls traits) - rust-lang#154218 (interpret/validity: remove unreachable error kind) - rust-lang#154225 (diagnostics: avoid ICE in confusable_method_name for associated functions) - rust-lang#154228 (Improve inline assembly error messages)
2 parents 55a87b9 + 4521a3f commit f77c980

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

tests/ui/unnested_or_patterns2.fixed

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ fn main() {
2323
//~^ unnested_or_patterns
2424
if let box (0 | 1 | 2 | 3 | 4) = Box::new(0) {}
2525
//~^ unnested_or_patterns
26-
if let box box (0 | 2 | 4) = Box::new(Box::new(0)) {}
26+
if let box (box (0 | 2 | 4)) = Box::new(Box::new(0)) {}
2727
//~^ unnested_or_patterns
2828
}

tests/ui/unnested_or_patterns2.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ LL | if let box box 0 | box (box 2 | box 4) = Box::new(Box::new(0)) {}
9393
help: nest the patterns
9494
|
9595
LL - if let box box 0 | box (box 2 | box 4) = Box::new(Box::new(0)) {}
96-
LL + if let box box (0 | 2 | 4) = Box::new(Box::new(0)) {}
96+
LL + if let box (box (0 | 2 | 4)) = Box::new(Box::new(0)) {}
9797
|
9898

9999
error: aborting due to 8 previous errors

0 commit comments

Comments
 (0)