---

yaml
---
r: 21311
b: refs/heads/snap-stage3
c: 11b640d
h: refs/heads/master
i:
  21309: cb957c5
  21307: d71e483
  21303: 9a66ab1
  21295: b19ceed
  21279: 7992cc7
  21247: d1970c8
v: v3

Author: paulstansifer

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 9ef56a6ca85ba30494fe63020cde08c8e91f39d4
+refs/heads/snap-stage3: 11b640d990220dc9386a300a10b2147d777d5452
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/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)),