Skip to content

Commit 4620994

Browse files
committed
Avoid span_delayed_bug on one path in AdtDef::eval_explicit_discr.
1 parent 10dcd73 commit 4620994

File tree

1 file changed

+8
-4
lines changed
  • compiler/rustc_middle/src/ty

1 file changed

+8
-4
lines changed

compiler/rustc_middle/src/ty/adt.rs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -494,11 +494,15 @@ impl<'tcx> AdtDef<'tcx> {
494494
}
495495
}
496496
Err(err) => {
497-
let msg = match err {
498-
ErrorHandled::Reported(..) => "enum discriminant evaluation failed",
499-
ErrorHandled::TooGeneric(..) => "enum discriminant depends on generics",
497+
match err {
498+
ErrorHandled::Reported(..) => {} // error guaranteed by `Reported`
499+
ErrorHandled::TooGeneric(..) => {
500+
tcx.dcx().span_delayed_bug(
501+
tcx.def_span(expr_did),
502+
"enum discriminant depends on generics",
503+
);
504+
}
500505
};
501-
tcx.dcx().span_delayed_bug(tcx.def_span(expr_did), msg);
502506
None
503507
}
504508
}

0 commit comments

Comments
 (0)