Pretty print empty structs properly

nrc · nikomatsakis · commit 65f189aa4788 · 2015-01-05T13:23:55.000-05:00
diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs
@@ -1553,6 +1553,9 @@ impl<'a> State<'a> {
 
             ast::ExprStruct(ref path, ref fields, ref wth) => {
                 try!(self.print_path(path, true));
+                if fields.is_empty() && wth.is_none() {
+                    return;
+                }
                 try!(word(&mut self.s, "{"));
                 try!(self.commasep_cmnt(
                     Consistent,
@@ -1576,7 +1579,7 @@ impl<'a> State<'a> {
                         try!(self.print_expr(&**expr));
                         try!(self.end());
                     }
-                    _ => try!(word(&mut self.s, ","))
+                    _ => try!(word(&mut self.s, ",")),
                 }
                 try!(word(&mut self.s, "}"));
             }

Original file line number	Diff line number	Diff line change
`@@ -1553,6 +1553,9 @@ impl<'a> State<'a> {`
`1553`	`1553`
`1554`	`1554`	`ast::ExprStruct(ref path, ref fields, ref wth) => {`
`1555`	`1555`	`try!(self.print_path(path, true));`
	`1556`	`+ if fields.is_empty() && wth.is_none() {`
	`1557`	`+ return;`
	`1558`	`+ }`
`1556`	`1559`	`try!(word(&mut self.s, "{"));`
`1557`	`1560`	`try!(self.commasep_cmnt(`
`1558`	`1561`	`Consistent,`
`@@ -1576,7 +1579,7 @@ impl<'a> State<'a> {`
`1576`	`1579`	`try!(self.print_expr(&**expr));`
`1577`	`1580`	`try!(self.end());`
`1578`	`1581`	`}`
`1579`		`- _ => try!(word(&mut self.s, ","))`
	`1582`	`+ _ => try!(word(&mut self.s, ",")),`
`1580`	`1583`	`}`
`1581`	`1584`	`try!(word(&mut self.s, "}"));`
`1582`	`1585`	`}`