Dedup code

Author: estebank

compiler/rustc_privacy/src/lib.rs

@@ -947,6 +947,25 @@ impl<'tcx> NamePrivacyVisitor<'tcx> {
             });
         }
     }
+
+    fn check_expanded_fields(
+        &mut self,
+        adt: ty::AdtDef<'tcx>,
+        variant: &'tcx ty::VariantDef,
+        fields: &[hir::ExprField<'tcx>],
+        hir_id: hir::HirId,
+        span: Span,
+    ) {
+        for (vf_index, variant_field) in variant.fields.iter_enumerated() {
+            let field =
+                fields.iter().find(|f| self.typeck_results().field_index(f.hir_id) == vf_index);
+            let (hir_id, use_ctxt, span) = match field {
+                Some(field) => (field.hir_id, field.ident.span, field.span),
+                None => (hir_id, span, span),
+            };
+            self.check_field(hir_id, use_ctxt, span, adt, variant_field, true);
+        }
+    }
 }
 
 impl<'tcx> Visitor<'tcx> for NamePrivacyVisitor<'tcx> {
@@ -971,28 +990,10 @@ impl<'tcx> Visitor<'tcx> for NamePrivacyVisitor<'tcx> {
                     // If the expression uses FRU we need to make sure all the unmentioned fields
                     // are checked for privacy (RFC 736). Rather than computing the set of
                     // unmentioned fields, just check them all.
-                    for (vf_index, variant_field) in variant.fields.iter_enumerated() {
-                        let field = fields
-                            .iter()
-                            .find(|f| self.typeck_results().field_index(f.hir_id) == vf_index);
-                        let (hir_id, use_ctxt, span) = match field {
-                            Some(field) => (field.hir_id, field.ident.span, field.span),
-                            None => (base.hir_id, base.span, base.span),
-                        };
-                        self.check_field(hir_id, use_ctxt, span, adt, variant_field, true);
-                    }
+                    self.check_expanded_fields(adt, variant, fields, base.hir_id, base.span);
                 }
                 hir::StructTailExpr::DefaultFields(span) => {
-                    for (vf_index, variant_field) in variant.fields.iter_enumerated() {
-                        let field = fields
-                            .iter()
-                            .find(|f| self.typeck_results().field_index(f.hir_id) == vf_index);
-                        let (hir_id, use_ctxt, span) = match field {
-                            Some(field) => (field.hir_id, field.ident.span, field.span),
-                            None => (expr.hir_id, span, span),
-                        };
-                        self.check_field(hir_id, use_ctxt, span, adt, variant_field, true);
-                    }
+                    self.check_expanded_fields(adt, variant, fields, expr.hir_id, span);
                 }
                 hir::StructTailExpr::None => {
                     for field in fields {