bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

fmt

Browse source
This commit is contained in:
b-naber 2022-06-24 16:43:38 +02:00
parent f39c0d6b0a
commit bf48b622a5
2 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
compiler/rustc_mir_build/src/thir/cx/expr.rs
View file

@ -203,14 +203,12 @@ impl<'tcx> Cx<'tcx> {
let res = self.typeck_results().qpath_res(qpath, source.hir_id); let res = self.typeck_results().qpath_res(qpath, source.hir_id);
let ty = self.typeck_results().node_type(source.hir_id); let ty = self.typeck_results().node_type(source.hir_id);
let ty::Adt(adt_def, substs) = ty.kind() else { let ty::Adt(adt_def, substs) = ty.kind() else {
return ExprKind::Cast { source: self.mirror_expr(source)}; return ExprKind::Cast { source: self.mirror_expr(source)};
}; };
let Res::Def(
DefKind::Ctor(CtorOf::Variant, CtorKind::Const), let Res::Def(DefKind::Ctor(CtorOf::Variant, CtorKind::Const), variant_ctor_id) = res else {
variant_ctor_id, return ExprKind::Cast { source: self.mirror_expr(source)};
) = res else { };
return ExprKind::Cast { source: self.mirror_expr(source)};
};
let idx = adt_def.variant_index_with_ctor_id(variant_ctor_id); let idx = adt_def.variant_index_with_ctor_id(variant_ctor_id);
let (discr_did, discr_offset) = adt_def.discriminant_def_for_variant(idx); let (discr_did, discr_offset) = adt_def.discriminant_def_for_variant(idx);

2
src/test/ui/const-generics/issues/issue-97634.rs
View file

@ -1,4 +1,4 @@
//build-pass // build-pass
pub enum Register<const N: u16> { pub enum Register<const N: u16> {
Field0 = 40, Field0 = 40,