correct the enum extra field and make sure the diagnostic mimic the hir_typeck

Author: Shourya742

compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs

@@ -2593,10 +2593,37 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
 
         for init in inits {
             if !variant_def.fields.iter().any(|field_def| field_def.name == init.field.name) {
-                let err = tcx.dcx().struct_span_err(
-                    init.field.span,
-                    format!("struct `{}` has no field named `{}`", variant_def.name, init.field),
-                );
+                let mut err = if adt_def.is_enum() {
+                    struct_span_code_err!(
+                        tcx.dcx(),
+                        init.field.span,
+                        E0559,
+                        "variant `{}::{}` has no field named `{}`",
+                        ty,
+                        variant_def.name,
+                        init.field
+                    )
+                } else {
+                    struct_span_code_err!(
+                        tcx.dcx(),
+                        init.field.span,
+                        E0560,
+                        "struct `{}` has no field named `{}`",
+                        variant_def.name,
+                        init.field
+                    )
+                };
+                if adt_def.is_enum() {
+                    err.span_label(
+                        init.field.span,
+                        format!("`{}::{}` does not have this field", ty, variant_def.name),
+                    );
+                } else {
+                    err.span_label(
+                        init.field.span,
+                        format!("`{}` does not have this field", variant_def.name),
+                    );
+                }
                 return ty::Const::new_error(tcx, err.emit());
             }
         }

tests/ui/const-generics/mgca/adt_expr_unit_enum_extra_field.rs

@@ -8,6 +8,6 @@ enum E {
 fn foo<const N: E>() {}
 
 fn main() {
-    E::S { x: const { 1 } };
+    foo::<{E::S { x: const { 1 } }}>();
         //~^ ERROR variant `E::S` has no field named `x` [E0559]
 }

tests/ui/const-generics/mgca/adt_expr_unit_enum_extra_field.stderr

@@ -1,10 +1,8 @@
 error[E0559]: variant `E::S` has no field named `x`
-  --> $DIR/adt_expr_unit_enum_extra_field.rs:11:12
+  --> $DIR/adt_expr_unit_enum_extra_field.rs:11:19
    |
-LL |     E::S { x: const { 1 } };
-   |            ^ `E::S` does not have this field
-   |
-   = note: all struct fields are already assigned
+LL |     foo::<{E::S { x: const { 1 } }}>();
+   |                   ^ `E::S` does not have this field
 
 error: aborting due to 1 previous error
 

tests/ui/const-generics/mgca/adt_expr_unit_struct_extra_field.rs

@@ -7,5 +7,5 @@ fn foo<const N: Foo>() {}
 
 fn main() {
     foo::<{ Foo { field: const { 1 } } }>();
-    //~^ ERROR struct `Foo` has no field named `field`
+    //~^ ERROR struct `Foo` has no field named `field` [E0560]
 }

tests/ui/const-generics/mgca/adt_expr_unit_struct_extra_field.stderr

@@ -1,8 +1,9 @@
-error: struct `Foo` has no field named `field`
+error[E0560]: struct `Foo` has no field named `field`
   --> $DIR/adt_expr_unit_struct_extra_field.rs:9:19
    |
 LL |     foo::<{ Foo { field: const { 1 } } }>();
-   |                   ^^^^^
+   |                   ^^^^^ `Foo` does not have this field
 
 error: aborting due to 1 previous error
 
+For more information about this error, try `rustc --explain E0560`.