fix visibilty check

compiler/rustc_hir_typeck/src/fn_ctxt/mod.rs

@@ -356,6 +356,12 @@ impl<'tcx> HirTyLowerer<'tcx> for FnCtxt<'_, 'tcx> {
  // of error recovery.
  field_indices.push((index, subindex));
 
+ if field.vis.is_accessible_from(sub_def_scope, self.tcx) {
+ self.tcx.check_stability(field.did, Some(hir_id), span, None);
+ } else {
+ self.private_field_err(ident, container_def.did()).emit();
+ }
+
  if !last {
  let field_ty = self.field_ty(span, field, args);
 
@@ -371,12 +377,6 @@ impl<'tcx> HirTyLowerer<'tcx> for FnCtxt<'_, 'tcx> {
  },
  );
 
- if field.vis.is_accessible_from(sub_def_scope, self.tcx) {
- self.tcx.check_stability(field.did, Some(hir_id), span, None);
- } else {
- self.private_field_err(ident, container_def.did()).emit();
- }
-
  current_container = field_ty;
  }
 
@@ -396,6 +396,12 @@ impl<'tcx> HirTyLowerer<'tcx> for FnCtxt<'_, 'tcx> {
  // of error recovery.
  field_indices.push((FIRST_VARIANT, index));
 
+ if field.vis.is_accessible_from(def_scope, self.tcx) {
+ self.tcx.check_stability(field.did, Some(hir_id), span, None);
+ } else {
+ self.private_field_err(ident, container_def.did()).emit();
+ }
+
  if !last {
  let field_ty = self.field_ty(span, field, args);
 
@@ -416,13 +422,6 @@ impl<'tcx> HirTyLowerer<'tcx> for FnCtxt<'_, 'tcx> {
  // not.
  }
  }
-
- if field.vis.is_accessible_from(def_scope, self.tcx) {
- self.tcx.check_stability(field.did, Some(hir_id), span, None);
- } else {
- self.private_field_err(ident, container_def.did()).emit();
- }
-
  current_container = field_ty;
  }
 

tests/ui/field_projections/deny-private-field.stderr → tests/ui/field_projections/deny-private-field.next.stderr

@@ -1,35 +1,35 @@
 error[E0616]: field `a` of struct `A` is private
- --> $DIR/deny-private-field.rs:43:25
+ --> $DIR/deny-private-field.rs:45:25
  |
 LL | let _: field_of!(A, a);
  | ^ private field
 
 error[E0616]: field `b` of struct `B` is private
- --> $DIR/deny-private-field.rs:45:27
+ --> $DIR/deny-private-field.rs:47:27
  |
 LL | let _: field_of!(A, b.b);
  | ^ private field
 
 error[E0616]: field `c` of struct `C` is private
- --> $DIR/deny-private-field.rs:47:29
+ --> $DIR/deny-private-field.rs:49:29
  |
 LL | let _: field_of!(A, b.c.c);
  | ^ private field
 
 error[E0616]: field `d` of struct `D` is private
- --> $DIR/deny-private-field.rs:49:31
+ --> $DIR/deny-private-field.rs:51:31
  |
 LL | let _: field_of!(A, b.c.d.d);
  | ^ private field
 
 error[E0616]: field `e` of struct `E` is private
- --> $DIR/deny-private-field.rs:51:33
+ --> $DIR/deny-private-field.rs:53:33
  |
 LL | let _: field_of!(A, b.c.d.e.e);
  | ^ private field
 
 error[E0616]: field `f` of struct `F` is private
- --> $DIR/deny-private-field.rs:53:35
+ --> $DIR/deny-private-field.rs:55:35
  |
 LL | let _: field_of!(A, b.c.d.e.f.f);
  | ^ private field

tests/ui/field_projections/deny-private-field.old.stderr

@@ -0,0 +1,39 @@
+error[E0616]: field `a` of struct `A` is private
+ --> $DIR/deny-private-field.rs:45:25
+ |
+LL | let _: field_of!(A, a);
+ | ^ private field
+
+error[E0616]: field `b` of struct `B` is private
+ --> $DIR/deny-private-field.rs:47:27
+ |
+LL | let _: field_of!(A, b.b);
+ | ^ private field
+
+error[E0616]: field `c` of struct `C` is private
+ --> $DIR/deny-private-field.rs:49:29
+ |
+LL | let _: field_of!(A, b.c.c);
+ | ^ private field
+
+error[E0616]: field `d` of struct `D` is private
+ --> $DIR/deny-private-field.rs:51:31
+ |
+LL | let _: field_of!(A, b.c.d.d);
+ | ^ private field
+
+error[E0616]: field `e` of struct `E` is private
+ --> $DIR/deny-private-field.rs:53:33
+ |
+LL | let _: field_of!(A, b.c.d.e.e);
+ | ^ private field
+
+error[E0616]: field `f` of struct `F` is private
+ --> $DIR/deny-private-field.rs:55:35
+ |
+LL | let _: field_of!(A, b.c.d.e.f.f);
+ | ^ private field
+
+error: aborting due to 6 previous errors
+
+For more information about this error, try `rustc --explain E0616`.