diff options
| author | Jules Bertholet <julesbertholet@quoi.xyz> | 2024-04-14 11:01:00 -0400 |
|---|---|---|
| committer | Jules Bertholet <julesbertholet@quoi.xyz> | 2024-04-15 23:34:54 -0400 |
| commit | 3efbe3e70ceb9825bcced29422e5f4a695bb254b (patch) | |
| tree | a5addea72a6fe900aba275efe9443e96abcef323 | |
| parent | 88cd821e6275ed18e493fd22201ee313154ea6a7 (diff) | |
| download | rust-3efbe3e70ceb9825bcced29422e5f4a695bb254b.tar.gz rust-3efbe3e70ceb9825bcced29422e5f4a695bb254b.zip | |
Simplify `calc_default_binding_mode`
| -rw-r--r-- | compiler/rustc_hir_typeck/src/pat.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/rustc_hir_typeck/src/pat.rs b/compiler/rustc_hir_typeck/src/pat.rs index 28681365af5..d66d327c49a 100644 --- a/compiler/rustc_hir_typeck/src/pat.rs +++ b/compiler/rustc_hir_typeck/src/pat.rs @@ -308,10 +308,9 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> { AdjustMode::ResetAndConsumeRef(ref_pat_mutbl) => { let mutbls_match = def_bm.0 == ByRef::Yes(ref_pat_mutbl); if pat.span.at_least_rust_2024() && self.tcx.features().ref_pat_eat_one_layer_2024 { - let max_ref_mutbl = cmp::min(max_ref_mutbl, ref_pat_mutbl); if mutbls_match { debug!("consuming inherited reference"); - (expected, INITIAL_BM, max_ref_mutbl, true) + (expected, INITIAL_BM, cmp::min(max_ref_mutbl, ref_pat_mutbl), true) } else { let (new_ty, new_bm, max_ref_mutbl) = if ref_pat_mutbl == Mutability::Mut { self.peel_off_references( |