---

yaml
---
r: 85998
b: refs/heads/dist-snap
c: 6655b3c
h: refs/heads/master
v: v3

Author: thestinger

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 0983ebe5310d4eb6d289f636f7ed0536c08bbc0e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 874611b348ba6fc18fb017c9f8a6a46b98ce6c76
+refs/heads/dist-snap: 6655b3c4620714e1a043be3b47f581719cefa12d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libstd/repr.rs

@@ -412,10 +412,12 @@ impl<'self> TyVisitor for ReprVisitor<'self> {
         true
     }
 
-    fn visit_enter_class(&mut self, name: &str, _n_fields: uint,
+    fn visit_enter_class(&mut self, name: &str, n_fields: uint,
                          _sz: uint, _align: uint) -> bool {
         self.writer.write(name.as_bytes());
-        self.writer.write(['{' as u8]);
+        if n_fields != 0 {
+            self.writer.write(['{' as u8]);
+        }
         true
     }
 
@@ -431,9 +433,11 @@ impl<'self> TyVisitor for ReprVisitor<'self> {
         true
     }
 
-    fn visit_leave_class(&mut self, _name: &str, _n_fields: uint,
+    fn visit_leave_class(&mut self, _name: &str, n_fields: uint,
                          _sz: uint, _align: uint) -> bool {
-        self.writer.write(['}' as u8]);
+        if n_fields != 0 {
+            self.writer.write(['}' as u8]);
+        }
         true
     }
 
@@ -650,5 +654,5 @@ fn test_repr() {
                "(10u64, ~\"hello\")");
 
     struct Foo;
-    exact_test(&(~[Foo, Foo]), "~[repr::test_repr::Foo{}, repr::test_repr::Foo{}]");
+    exact_test(&(~[Foo, Foo]), "~[repr::test_repr::Foo, repr::test_repr::Foo]");
 }

branches/dist-snap/src/libstd/vec.rs

@@ -3682,11 +3682,11 @@ mod tests {
 
         let xs = ~[Foo, Foo, Foo];
         assert_eq!(fmt!("%?", xs.slice(0, 2).to_owned()),
-                   ~"~[vec::tests::Foo{}, vec::tests::Foo{}]");
+                   ~"~[vec::tests::Foo, vec::tests::Foo]");
 
         let xs: [Foo, ..3] = [Foo, Foo, Foo];
         assert_eq!(fmt!("%?", xs.slice(0, 2).to_owned()),
-                   ~"~[vec::tests::Foo{}, vec::tests::Foo{}]");
+                   ~"~[vec::tests::Foo, vec::tests::Foo]");
         cnt = 0;
         for f in xs.iter() {
             assert!(*f == Foo);

branches/dist-snap/src/test/run-pass/ifmt.rs

@@ -29,7 +29,7 @@ pub fn main() {
 
     // Make sure there's a poly formatter that takes anything
     t!(format!("{:?}", 1), "1");
-    t!(format!("{:?}", A), "A{}");
+    t!(format!("{:?}", A), "A");
     t!(format!("{:?}", ()), "()");
     t!(format!("{:?}", @(~1, "foo")), "@(~1, \"foo\")");