about summary refs log tree commit diff
diff options
context:
space:
mode:
authorb-naber <bn263@gmx.de>2022-06-24 16:43:38 +0200
committerb-naber <bn263@gmx.de>2022-06-24 16:43:38 +0200
commitbf48b622a5ff7efc16ac099bbe8d272445a49d70 (patch)
tree0e14f76a6a7f8aa532758ef6d2f3f4443309a4cb
parentf39c0d6b0a7b80959956a6e006dfc3406f8141e3 (diff)
downloadrust-bf48b622a5ff7efc16ac099bbe8d272445a49d70.tar.gz
rust-bf48b622a5ff7efc16ac099bbe8d272445a49d70.zip
fmt
-rw-r--r--compiler/rustc_mir_build/src/thir/cx/expr.rs14
-rw-r--r--src/test/ui/const-generics/issues/issue-97634.rs2
2 files changed, 7 insertions, 9 deletions
diff --git a/compiler/rustc_mir_build/src/thir/cx/expr.rs b/compiler/rustc_mir_build/src/thir/cx/expr.rs
index b127b264b83..a0878c97e88 100644
--- a/compiler/rustc_mir_build/src/thir/cx/expr.rs
+++ b/compiler/rustc_mir_build/src/thir/cx/expr.rs
@@ -203,14 +203,12 @@ impl<'tcx> Cx<'tcx> {
             let res = self.typeck_results().qpath_res(qpath, source.hir_id);
             let ty = self.typeck_results().node_type(source.hir_id);
             let ty::Adt(adt_def, substs) = ty.kind() else {
-                    return ExprKind::Cast { source: self.mirror_expr(source)};
-                };
-            let Res::Def(
-                            DefKind::Ctor(CtorOf::Variant, CtorKind::Const),
-                            variant_ctor_id,
-                        ) = res 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), variant_ctor_id) = res else {
+                return ExprKind::Cast { source: self.mirror_expr(source)};
+            };
 
             let idx = adt_def.variant_index_with_ctor_id(variant_ctor_id);
             let (discr_did, discr_offset) = adt_def.discriminant_def_for_variant(idx);
diff --git a/src/test/ui/const-generics/issues/issue-97634.rs b/src/test/ui/const-generics/issues/issue-97634.rs
index a04036d0647..422e8de6856 100644
--- a/src/test/ui/const-generics/issues/issue-97634.rs
+++ b/src/test/ui/const-generics/issues/issue-97634.rs
@@ -1,4 +1,4 @@
-//build-pass
+// build-pass
 
 pub enum Register<const N: u16> {
     Field0 = 40,