interpret: read_discriminant: only return VariantIdx

2023-07-24 17:45:27 +02:00
parent a2bcafa500
commit 14a674c88c
7 changed files with 49 additions and 35 deletions
--- a/compiler/rustc_const_eval/src/const_eval/valtrees.rs
+++ b/compiler/rustc_const_eval/src/const_eval/valtrees.rs
@@ -130,7 +130,7 @@ pub(crate) fn const_to_valtree_inner<'tcx>(
                bug!("uninhabited types should have errored and never gotten converted to valtree")
            }

-            let Ok((_, variant)) = ecx.read_discriminant(&place.into()) else {
+            let Ok(variant) = ecx.read_discriminant(&place.into()) else {
                return Err(ValTreeCreationError::Other);
            };
            branches(ecx, place, def.variant(variant).fields.len(), def.is_enum().then_some(variant), num_nodes)