---

yaml
---
r: 30572
b: refs/heads/incoming
c: be162da
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 2018cd912cc98e0c3555b3ca827ad504fe02c3d4
+refs/heads/incoming: be162da9614624f8fd5f5d03909bb99c6ab2c647
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/repr.rs

@@ -500,7 +500,8 @@ fn test_repr2() {
 enum EnumVisitState {
     PreVariant,     // We're before the variant we're interested in.
     InVariant,      // We're inside the variant we're interested in.
-    PostVariant     // We're after the variant we're interested in.
+    PostVariant,    // We're after the variant we're interested in.
+    Newtype         // This is a newtyped enum.
 }
 
 impl EnumVisitState : cmp::Eq {
@@ -859,13 +860,14 @@ impl ReprPrinterWrapper : TyVisitor {
 
     // Enums
 
-    fn visit_enter_enum(_n_variants: uint, sz: uint, align: uint) -> bool {
+    fn visit_enter_enum(n_variants: uint, sz: uint, align: uint) -> bool {
         unsafe {
             self.printer.align(align);
 
             // Write in the location of the end of this enum.
             let end_ptr = transmute(self.printer.ptr as uint + sz);
-            let new_state = EnumState { end_ptr: end_ptr, state: PreVariant };
+            let state = if n_variants == 1 { Newtype } else { PreVariant };
+            let new_state = EnumState { end_ptr: end_ptr, state: state };
             self.printer.enum_stack.push(new_state);
 
             true
@@ -889,21 +891,27 @@ impl ReprPrinterWrapper : TyVisitor {
                         stack.set_elt(stack.len() - 1, enum_state);
                     }
                 }
+                Newtype => {
+                    self.printer.writer.write_str(name);
+                }
                 InVariant | PostVariant => {}
             }
             true
         }
     }
 
     fn visit_enum_variant_field(i: uint, inner: *TyDesc) -> bool {
-        if self.printer.enum_stack.last().state == InVariant {
-            if i == 0 {
-                self.printer.writer.write_char('(');
-            } else {
-                self.printer.writer.write_str(", ");
-            }
+        match self.printer.enum_stack.last().state {
+            InVariant | Newtype => {
+                if i == 0 {
+                    self.printer.writer.write_char('(');
+                } else {
+                    self.printer.writer.write_str(", ");
+                }
 
-            intrinsic::visit_tydesc(inner, self as @TyVisitor);
+                intrinsic::visit_tydesc(inner, self as @TyVisitor);
+            }
+            PreVariant | PostVariant => {}
         }
         true
     }
@@ -920,6 +928,9 @@ impl ReprPrinterWrapper : TyVisitor {
                 enum_state.state = PostVariant;
                 stack.set_elt(stack.len() - 1, enum_state);
             }
+            Newtype => {
+                if n_fields >= 1 { self.printer.writer.write_char(')'); }
+            }
             PreVariant | PostVariant => {}
         }
         true