Skip to content

Commit 467ba69

Browse files
committed
fix(upstream): TypingMode is no longer PartialEq
1 parent 7246b11 commit 467ba69

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

flake.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/mir/elaborate_drop.rs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -549,10 +549,15 @@ where
549549
let subpath = self.elaborator.field_subpath(variant_path, field_idx);
550550
let tcx = self.tcx();
551551

552-
assert_eq!(
553-
self.elaborator.typing_env().typing_mode,
554-
ty::TypingMode::PostAnalysis
555-
);
552+
match self.elaborator.typing_env().typing_mode() {
553+
ty::TypingMode::PostAnalysis => {}
554+
ty::TypingMode::Coherence
555+
| ty::TypingMode::Analysis { .. }
556+
| ty::TypingMode::Borrowck { .. }
557+
| ty::TypingMode::PostBorrowckAnalysis { .. } => {
558+
bug!()
559+
}
560+
}
556561
let field_ty = match tcx.try_normalize_erasing_regions(
557562
self.elaborator.typing_env(),
558563
field.ty(tcx, args),

0 commit comments

Comments
 (0)