---

yaml
---
r: 23419
b: refs/heads/master
c: 11b640d
h: refs/heads/master
i:
  23417: 5b9fd0f
  23415: 48f7f8e
v: v3

Author: paulstansifer

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 9ef56a6ca85ba30494fe63020cde08c8e91f39d4
+refs/heads/master: 11b640d990220dc9386a300a10b2147d777d5452
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/libsyntax/print/pprust.rs

@@ -527,11 +527,13 @@ fn print_item(s: ps, &&item: @ast::item) {
       }
       ast::item_mac({node: ast::mac_invoc_tt(pth, tts), _}) => {
         print_path(s, pth, false);
-        head(s, ~"! ");
+        word(s.s, ~"! ");
         print_ident(s, item.ident);
-        bopen(s);
+        cbox(s, indent_unit);
+        popen(s);
         for tts.each |tt| { print_tt(s, tt);  }
-        bclose(s, item.span);
+        pclose(s);
+        end(s);
       }
       ast::item_mac(_) => {
         fail ~"invalid item-position syntax bit"
@@ -931,10 +933,10 @@ fn print_mac(s: ps, m: ast::mac) {
       }
       ast::mac_invoc_tt(pth, tts) => {
         print_path(s, pth, false);
-        head(s, ~"!");
-        bopen(s);
+        word(s.s, ~"!");
+        popen(s);
         for tts.each() |tt| { print_tt(s, tt); }
-        bclose(s, m.span);
+        pclose(s);
       }
       ast::mac_ellipsis => word(s.s, ~"..."),
       ast::mac_var(v) => word(s.s, fmt!("$%u", v)),