Address Comments

Re-add removed comment in librustc_privacy
Remove `vis` field from `VariantDef`
Fixup weirdly-formatted comments in metadata::encoder

Author: Aatch

src/librustc/metadata/decoder.rs

@@ -1052,7 +1052,6 @@ fn get_struct_datatype_def<'tcx>(tcx: &ty::ctxt<'tcx>, intr: &IdentInterner,
             name: name,
             disr_val: 0,
             fields: fields,
-            vis: ast::Public,
         }]
     });
 
@@ -1093,7 +1092,6 @@ fn get_enum_datatype_def<'tcx>(tcx: &ty::ctxt<'tcx>, intr: &IdentInterner,
             name: vname,
             disr_val: disr_val,
             fields: fields,
-            vis: ast::Public,
         }
     }).collect();
 

src/librustc/metadata/encoder.rs

@@ -1136,19 +1136,19 @@ fn encode_info_for_item(ecx: &EncodeContext,
           let def = ty::lookup_datatype_def(tcx, def_id);
           let fields = &def.variants[0].fields[..];
 
-          /* First, encode the fields
-          These come first because we need to write them to make
-          the index, and the index needs to be in the item for the
-          class itself */
+          // First, encode the fields
+          // These come first because we need to write them to make
+          // the index, and the index needs to be in the item for the
+          // class itself
           let idx = encode_info_for_struct(ecx,
                                            rbml_w,
                                            fields,
                                            index);
 
-          /* Index the class*/
+          // Index the class
           add_to_index(item, rbml_w, index);
 
-          /* Now, make an item for the class itself */
+          // Now, make an item for the class itself
           rbml_w.start_tag(tag_items_data_item);
           encode_def_id(rbml_w, def_id);
           encode_family(rbml_w, 'S');
@@ -1162,17 +1162,17 @@ fn encode_info_for_item(ecx: &EncodeContext,
           encode_visibility(rbml_w, vis);
           encode_repr_attrs(rbml_w, ecx, &item.attrs[]);
 
-          /* Encode def_ids for each field and method
-          for methods, write all the stuff get_trait_method
-          needs to know*/
+          // Encode def_ids for each field and method
+          // for methods, write all the stuff get_trait_method
+          // needs to know
           encode_struct_fields(rbml_w, fields, def_id);
 
           encode_inlined_item(ecx, rbml_w, IIItemRef(item));
 
           // Encode inherent implementations for this structure.
           encode_inherent_implementations(ecx, rbml_w, def_id);
 
-          /* Each class has its own index -- encode it */
+          // Each class has its own index -- encode it
           encode_index(rbml_w, idx, write_i64);
           rbml_w.end_tag();
 

src/librustc/middle/ty.rs

@@ -2281,7 +2281,6 @@ pub struct VariantDef<'tcx> {
     pub name: Name,
     pub disr_val: Disr,
     pub fields: Vec<FieldTy<'tcx>>,
-    pub vis: Visibility,
 }
 
 

src/librustc_privacy/lib.rs

@@ -879,6 +879,9 @@ impl<'a, 'tcx, 'v> Visitor<'v> for PrivacyVisitor<'a, 'tcx> {
             ast::ExprStruct(_, ref fields, _) => {
                 match ty::expr_ty(self.tcx, expr).sty {
                     ty::ty_struct(def, _) => {
+                        // RFC 736: ensure all unmentioned fields are visible.
+                        // Rather than computing the set of unmentioned fields
+                        // (i.e. `all_fields - fields`, just check them all.
                         for field in &def.variants[0].fields {
                             self.check_field(expr.span, def, def.def_id,
                                              NamedField(field.name));

src/librustc_typeck/check/mod.rs

@@ -86,7 +86,7 @@ use astconv::{self, ast_region_to_region, ast_ty_to_ty, AstConv, PathParamMode};
 use check::_match::pat_ctxt;
 use fmt_macros::{Parser, Piece, Position};
 use middle::astconv_util::{check_path_args, NO_TPS, NO_REGIONS};
-use middle::{const_eval, def};
+use middle::{def};
 use middle::infer;
 use middle::mem_categorization as mc;
 use middle::mem_categorization::McResult;

src/librustc_typeck/collect.rs

@@ -1570,7 +1570,6 @@ fn get_struct_def<'a, 'tcx>(ccx: &CrateCtxt<'a, 'tcx>,
             name: name,
             disr_val: 0,
             fields: fields,
-            vis: ast::Public,
         }]
     });
 
@@ -1637,7 +1636,6 @@ fn get_enum_def<'a, 'tcx>(ccx: &CrateCtxt<'a, 'tcx>, def_id: ast::DefId,
                     name: v.node.name.name,
                     disr_val: discriminant,
                     fields: fields,
-                    vis: ast::Public,
                 }
             }
             ast::TupleVariantKind(_) => {
@@ -1646,7 +1644,6 @@ fn get_enum_def<'a, 'tcx>(ccx: &CrateCtxt<'a, 'tcx>, def_id: ast::DefId,
                     name: v.node.name.name,
                     disr_val: discriminant,
                     fields: Vec::new(),
-                    vis: ast::Public,
                 }
             }
             ast::StructVariantKind(ref struct_def) => {
@@ -1681,7 +1678,6 @@ fn get_enum_def<'a, 'tcx>(ccx: &CrateCtxt<'a, 'tcx>, def_id: ast::DefId,
                     name: v.node.name.name,
                     disr_val: discriminant,
                     fields: fields,
-                    vis: ast::Public,
                 }
             }
         }