Skip to content

Commit 818add5

Browse files
committed
w
1 parent 490b142 commit 818add5

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

compiler/rustc_trait_selection/src/traits/normalize.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ pub(super) fn needs_normalization<'tcx, T: TypeVisitable<TyCtxt<'tcx>>>(
120120
match infcx.typing_mode() {
121121
// FIXME(#132279): We likely want to reveal opaques during post borrowck analysis
122122
TypingMode::Coherence
123-
| TypingMode::Analysis { defining_opaque_types: _ }
123+
| TypingMode::Analysis { .. }
124124
| TypingMode::PostBorrowckAnalysis { .. } => flags.remove(ty::TypeFlags::HAS_TY_OPAQUE),
125125
TypingMode::PostAnalysis => {}
126126
}
@@ -216,7 +216,7 @@ impl<'a, 'b, 'tcx> TypeFolder<TyCtxt<'tcx>> for AssocTypeNormalizer<'a, 'b, 'tcx
216216
match self.selcx.infcx.typing_mode() {
217217
// FIXME(#132279): We likely want to reveal opaques during post borrowck analysis
218218
TypingMode::Coherence
219-
| TypingMode::Analysis { defining_opaque_types: _ }
219+
| TypingMode::Analysis { .. }
220220
| TypingMode::PostBorrowckAnalysis { .. } => ty.super_fold_with(self),
221221
TypingMode::PostAnalysis => {
222222
let recursion_limit = self.cx().recursion_limit();

compiler/rustc_trait_selection/src/traits/query/normalize.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ impl<'a, 'tcx> FallibleTypeFolder<TyCtxt<'tcx>> for QueryNormalizer<'a, 'tcx> {
217217
// Only normalize `impl Trait` outside of type inference, usually in codegen.
218218
match self.infcx.typing_mode() {
219219
TypingMode::Coherence
220-
| TypingMode::Analysis { defining_opaque_types: _ }
220+
| TypingMode::Analysis { .. }
221221
| TypingMode::PostBorrowckAnalysis { .. } => ty.try_super_fold_with(self)?,
222222

223223
TypingMode::PostAnalysis => {

compiler/rustc_trait_selection/src/traits/select/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1521,7 +1521,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
15211521
}
15221522
// The hidden types of `defined_opaque_types` is not local to the current
15231523
// inference context, so we can freely move this to the global cache.
1524-
TypingMode::PostBorrowckAnalysis { defined_opaque_types: _ } => true,
1524+
TypingMode::PostBorrowckAnalysis { .. } => true,
15251525
// The global cache is only used if there are no opaque types in
15261526
// the defining scope or we're outside of analysis.
15271527
//

0 commit comments

Comments
 (0)