bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Avoid span_delayed_bug on one path in AdtDef::eval_explicit_discr.

Browse source 
Also change its return type to `Result`.
This commit is contained in:
Nicholas Nethercote 2024-02-16 16:40:51 +11:00
parent d0267cb26b
commit b2d1d6f6ff
2 changed files with 25 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_hir_analysis/src/collect.rs
View file

@ -760,7 +760,7 @@ fn convert_enum_variant_types(tcx: TyCtxt<'_>, def_id: DefId) {
let wrapped_discr = prev_discr.map_or(initial, |d| d.wrap_incr(tcx));
prev_discr = Some(
if let ty::VariantDiscr::Explicit(const_def_id) = variant.discr {
def.eval_explicit_discr(tcx, const_def_id)
def.eval_explicit_discr(tcx, const_def_id).ok()
} else if let Some(discr) = repr_type.disr_incr(tcx, prev_discr) {
Some(discr)
} else {