Pretty print empty structs properly

nrc · nrc · commit 791f54568598 · 2015-01-07T10:49:00.000+13:00
diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs
@@ -1537,6 +1537,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,
@@ -1560,7 +1563,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
`@@ -1537,6 +1537,9 @@ impl<'a> State<'a> {`
`1537`	`1537`
`1538`	`1538`	`ast::ExprStruct(ref path, ref fields, ref wth) => {`
`1539`	`1539`	`try!(self.print_path(path, true));`
	`1540`	`+ if fields.is_empty() && wth.is_none() {`
	`1541`	`+ return;`
	`1542`	`+ }`
`1540`	`1543`	`try!(word(&mut self.s, "{"));`
`1541`	`1544`	`try!(self.commasep_cmnt(`
`1542`	`1545`	`Consistent,`
`@@ -1560,7 +1563,7 @@ impl<'a> State<'a> {`
`1560`	`1563`	`try!(self.print_expr(&**expr));`
`1561`	`1564`	`try!(self.end());`
`1562`	`1565`	`}`
`1563`		`- _ => try!(word(&mut self.s, ","))`
	`1566`	`+ _ => try!(word(&mut self.s, ",")),`
`1564`	`1567`	`}`
`1565`	`1568`	`try!(word(&mut self.s, "}"));`
`1566`	`1569`	`}`