Skip to content

Commit 40487ec

Browse files
committed
Auto merge of #137466 - jhpratt:rollup-spyi02y, r=jhpratt
Rollup of 9 pull requests Successful merges: - #135354 ([Debuginfo] Add MSVC Synthetic and Summary providers to LLDB) - #136826 (Replace mem::zeroed with mem::MaybeUninit::uninit for large struct in Unix) - #137194 (More const {} init in thread_local) - #137334 (Greatly simplify lifetime captures in edition 2024) - #137382 (bootstrap: add doc for vendor build step) - #137423 (Improve a bit HIR pretty printer) - #137435 (Fix "missing match arm body" suggestion involving `!`) - #137448 (Fix bugs due to unhandled `ControlFlow` in compiler) - #137458 (Fix missing self subst when rendering `impl Fn*<T>` with no output type) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 7013511 + 6a6a495 commit 40487ec

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

crates/hir-ty/src/diagnostics/match_check/pat_analysis.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -361,11 +361,11 @@ impl PatCx for MatchCheckCtx<'_> {
361361
}
362362
}
363363

364-
fn ctor_sub_tys<'a>(
365-
&'a self,
366-
ctor: &'a rustc_pattern_analysis::constructor::Constructor<Self>,
367-
ty: &'a Self::Ty,
368-
) -> impl ExactSizeIterator<Item = (Self::Ty, PrivateUninhabitedField)> + Captures<'a> {
364+
fn ctor_sub_tys(
365+
&self,
366+
ctor: &rustc_pattern_analysis::constructor::Constructor<Self>,
367+
ty: &Self::Ty,
368+
) -> impl ExactSizeIterator<Item = (Self::Ty, PrivateUninhabitedField)> {
369369
let single = |ty| smallvec![(ty, PrivateUninhabitedField(false))];
370370
let tys: SmallVec<[_; 2]> = match ctor {
371371
Struct | Variant(_) | UnionField => match ty.kind(Interner) {

0 commit comments

Comments
 (0)