---

yaml
---
r: 30573
b: refs/heads/incoming
c: 48496fc
h: refs/heads/master
i:
  30571: aa0ec6d
v: v3

Author: nikomatsakis

[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: be162da9614624f8fd5f5d03909bb99c6ab2c647
+refs/heads/incoming: 48496fc1b62a2b7724117746f352b6b330aa63fb
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/repr.rs

@@ -501,7 +501,7 @@ 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.
-    Newtype         // This is a newtyped enum.
+    Degenerate      // This is a degenerate enum (exactly 1 variant)
 }
 
 impl EnumVisitState : cmp::Eq {
@@ -866,7 +866,7 @@ impl ReprPrinterWrapper : TyVisitor {
 
             // Write in the location of the end of this enum.
             let end_ptr = transmute(self.printer.ptr as uint + sz);
-            let state = if n_variants == 1 { Newtype } else { PreVariant };
+            let state = if n_variants == 1 { Degenerate } else { PreVariant };
             let new_state = EnumState { end_ptr: end_ptr, state: state };
             self.printer.enum_stack.push(new_state);
 
@@ -891,7 +891,7 @@ impl ReprPrinterWrapper : TyVisitor {
                         stack.set_elt(stack.len() - 1, enum_state);
                     }
                 }
-                Newtype => {
+                Degenerate => {
                     self.printer.writer.write_str(name);
                 }
                 InVariant | PostVariant => {}
@@ -902,7 +902,7 @@ impl ReprPrinterWrapper : TyVisitor {
 
     fn visit_enum_variant_field(i: uint, inner: *TyDesc) -> bool {
         match self.printer.enum_stack.last().state {
-            InVariant | Newtype => {
+            InVariant | Degenerate => {
                 if i == 0 {
                     self.printer.writer.write_char('(');
                 } else {
@@ -928,7 +928,7 @@ impl ReprPrinterWrapper : TyVisitor {
                 enum_state.state = PostVariant;
                 stack.set_elt(stack.len() - 1, enum_state);
             }
-            Newtype => {
+            Degenerate => {
                 if n_fields >= 1 { self.printer.writer.write_char(')'); }
             }
             PreVariant | PostVariant => {}

branches/incoming/src/test/run-pass/log-degen-enum.rs

@@ -0,0 +1,7 @@
+enum Foo = uint;
+
+fn main() {
+    let x = Foo(1);
+    let y = fmt!("%?", x);
+    assert y == ~"Foo(1)";
+}