summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-02-02 14:00:50 +0000
committerbors <bors@rust-lang.org>2016-02-02 14:00:50 +0000
commit59b7c907a3e3dd8b263297adf6ff0515fac125e3 (patch)
treea45c2760b88b026bf6aee2a15c259c3dd3d976c2 /src/libsyntax
parentddd1bf594fdaf2f4a9ac3f03ffdb726f5121050e (diff)
parent9a30ecdf1169dd53a1e226cc3523260ef88fd90a (diff)
downloadrust-59b7c907a3e3dd8b263297adf6ff0515fac125e3.tar.gz
rust-59b7c907a3e3dd8b263297adf6ff0515fac125e3.zip
Auto merge of #31254 - tmiasko:macro-pretty-print-fix, r=sfackler
Pretty printing of macro with braces but without terminated semicolon
removed more boxes from stack than it put there, resulting in panic.
This fixes the issue #30731.
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/print/pprust.rs7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs
index e80297eb797..759b16c5738 100644
--- a/src/libsyntax/print/pprust.rs
+++ b/src/libsyntax/print/pprust.rs
@@ -1781,11 +1781,8 @@ impl<'a> State<'a> {
             token::Paren => try!(self.popen()),
             token::Bracket => try!(word(&mut self.s, "[")),
             token::Brace => {
-                // head-ibox, will be closed by bopen()
-                try!(self.ibox(0));
-                // Don't ask me why the regular bopen() does
-                // more then just opening a brace...
-                try!(self.bopen())
+                try!(self.head(""));
+                try!(self.bopen());
             }
         }
         try!(self.print_tts(&m.node.tts));