Don't allow single-variant enums to be dereferenced. rust-lang#6246

I'm not sure if this was even intentional at this point.

Author: brson

src/librustc/middle/privacy.rs

@@ -414,19 +414,6 @@ impl<'self> PrivacyVisitor<'self> {
         return false;
     }
 
-    // Checks that a dereference of a univariant enum can occur.
-    fn check_variant(&self, span: Span, enum_id: ast::DefId) {
-        let variant_info = ty::enum_variants(self.tcx, enum_id)[0];
-
-        match self.def_privacy(variant_info.id) {
-            Allowable => {}
-            ExternallyDenied | DisallowedBy(*) => {
-                self.tcx.sess.span_err(span, "can only dereference enums \
-                                              with a single, public variant");
-            }
-        }
-    }
-
     // Checks that a field is in scope.
     // FIXME #6993: change type (and name) from Ident to Name
     fn check_field(&mut self, span: Span, id: ast::DefId, ident: ast::Ident) {
@@ -739,18 +726,6 @@ impl<'self> Visitor<()> for PrivacyVisitor<'self> {
                                                             struct type?!"),
                 }
             }
-            ast::ExprUnary(_, ast::UnDeref, operand) => {
-                // In *e, we need to check that if e's type is an
-                // enum type t, then t's first variant is public or
-                // privileged. (We can assume it has only one variant
-                // since typeck already happened.)
-                match ty::get(ty::expr_ty(self.tcx, operand)).sty {
-                    ty::ty_enum(id, _) => {
-                        self.check_variant(expr.span, id);
-                    }
-                    _ => { /* No check needed */ }
-                }
-            }
             _ => {}
         }
 

src/librustc/middle/resolve.rs

@@ -1275,7 +1275,10 @@ impl Resolver {
                     } if path.segments.len() == 1 => {
                         let name = path_to_ident(path);
 
-                        let new_parent = match parent.children.find(&name.name) {
+                        let ModuleReducedGraphParent(@Module {
+                            children: ref children, _
+                        }) = parent;
+                        let new_parent = match children.find(&name.name) {
                             // It already exists
                             Some(&child) if child.get_module_if_available()
                                                  .is_some() &&
@@ -1542,7 +1545,11 @@ impl Resolver {
                                                           false,
                                                           true);
 
-                        parent.external_module_children.insert(
+                        let ModuleReducedGraphParent(@Module {
+                            external_module_children: ref external_module_children, _
+                        }) = parent;
+
+                        external_module_children.insert(
                             name.name,
                             external_module);
 

src/librustc/middle/trans/datum.rs

@@ -628,37 +628,6 @@ impl Datum {
             ty::ty_rptr(_, mt) => {
                 return (Some(deref_ptr(bcx, self, mt.ty)), bcx);
             }
-            ty::ty_enum(did, ref substs) => {
-                // Check whether this enum is a newtype enum:
-                let variants = ty::enum_variants(ccx.tcx, did);
-                if (*variants).len() != 1 || variants[0].args.len() != 1 {
-                    return (None, bcx);
-                }
-
-                let repr = adt::represent_type(ccx, self.ty);
-                let ty = ty::subst(ccx.tcx, substs, variants[0].args[0]);
-                return match self.mode {
-                    ByRef(_) => {
-                        // Recast lv.val as a pointer to the newtype
-                        // rather than a ptr to the enum type.
-                        (
-                            Some(Datum {
-                                val: adt::trans_field_ptr(bcx, repr, self.val,
-                                                    0, 0),
-                                ty: ty,
-                                mode: ByRef(ZeroMem)
-                            }),
-                            bcx
-                        )
-                    }
-                    ByValue => {
-                        // Actually, this case cannot happen right
-                        // now, because enums are never immediate.
-                        assert!(type_is_immediate(bcx.ccx(), ty));
-                        (Some(Datum {ty: ty, ..*self}), bcx)
-                    }
-                };
-            }
             ty::ty_struct(did, ref substs) => {
                 // Check whether this struct is a newtype struct.
                 let fields = ty::struct_fields(ccx.tcx, did, substs);

src/librustc/middle/ty.rs

@@ -2675,16 +2675,6 @@ pub fn deref_sty(cx: ctxt, sty: &sty, explicit: bool) -> Option<mt> {
         Some(mt)
       }
 
-      ty_enum(did, ref substs) => {
-        let variants = enum_variants(cx, did);
-        if (*variants).len() == 1u && variants[0].args.len() == 1u {
-            let v_t = subst(cx, substs, variants[0].args[0]);
-            Some(mt {ty: v_t, mutbl: ast::MutImmutable})
-        } else {
-            None
-        }
-      }
-
       ty_struct(did, ref substs) => {
         let fields = struct_fields(cx, did, substs);
         if fields.len() == 1 && fields[0].ident ==

src/librustc/middle/typeck/check/mod.rs

@@ -2475,12 +2475,6 @@ pub fn check_expr_with_unifier(fcx: @mut FnCtxt,
                         }
                         None => {
                             match *sty {
-                                ty::ty_enum(*) => {
-                                    tcx.sess.span_err(
-                                        expr.span,
-                                        "can only dereference enums with a single variant which \
-                                         has a single argument");
-                                }
                                 ty::ty_struct(*) => {
                                     tcx.sess.span_err(
                                         expr.span,

src/test/compile-fail/issue-818.rs

@@ -32,7 +32,9 @@ fn linear_map<K,V>() -> HashMap<K,V> {
 
 impl<K,V> HashMap<K,V> {
     pub fn len(&mut self) -> uint {
-        self.size
+        match *self {
+            HashMap_(l) => l.size
+        }
     }
 }