pprust: Fix formatting regressions from the previous commits

Fix some remaining cases of bad formatting
Update some failing tests

src/libsyntax/mut_visit.rs

@@ -1328,7 +1328,7 @@ mod tests {
                 matches_codepattern,
                 "matches_codepattern",
                 pprust::to_string(|s| fake_print_crate(s, &krate)),
-                "macro_rules! zz((zz$zz:zz$(zz $zz:zz)zz+=>(zz$(zz$zz$zz)+)));".to_string());
+                "macro_rules! zz{(zz$zz:zz$(zz $zz:zz)zz+=>(zz$(zz$zz$zz)+))}".to_string());
         })
     }
 }

src/libsyntax/print/pprust.rs

@@ -714,6 +714,9 @@ pub trait PrintState<'a>: std::ops::Deref<Target=pp::Printer> + std::ops::DerefM
         convert_dollar_crate: bool,
         span: Span,
     ) {
+        if delim == DelimToken::Brace {
+            self.cbox(INDENT_UNIT);
+        }
         if let Some(path) = path {
             self.print_path(path, false, 0);
         }
@@ -721,27 +724,27 @@ pub trait PrintState<'a>: std::ops::Deref<Target=pp::Printer> + std::ops::DerefM
             self.word("!");
         }
         if let Some(ident) = ident {
-            self.space();
+            self.nbsp();
             self.print_ident(ident);
-            self.space();
         }
         match delim {
-            DelimToken::Paren => self.popen(),
-            DelimToken::Bracket => self.word("["),
-            DelimToken::NoDelim => self.word(" "),
             DelimToken::Brace => {
-                self.head("");
+                if path.is_some() || has_bang || ident.is_some() {
-                self.bopen();
+                    self.nbsp();
                 }
+                self.word("{");
+                if !tts.is_empty() {
+                    self.space();
+                }
+            }
+            _ => self.word(token_kind_to_string(&token::OpenDelim(delim))),
         }
         self.ibox(0);
         self.print_tts(tts, convert_dollar_crate);
         self.end();
         match delim {
-            DelimToken::Paren => self.pclose(),
-            DelimToken::Bracket => self.word("]"),
-            DelimToken::NoDelim => self.word(" "),
             DelimToken::Brace => self.bclose(span),
+            _ => self.word(token_kind_to_string(&token::CloseDelim(delim))),
         }
     }
 

src/test/pretty/delimited-token-groups.rs

@@ -0,0 +1,49 @@
+// pp-exact
+
+#![feature(rustc_attrs)]
+
+macro_rules! mac { ($ ($ tt : tt) *) => () }
+
+mac! {
+    struct S { field1 : u8 , field2 : u16 , } impl Clone for S
+    {
+        fn clone () -> S
+        {
+            panic ! () ;
+
+        }
+    }
+}
+
+mac! {
+    a
+    (aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa
+     aaaaaaaa aaaaaaaa) a
+    [aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa
+     aaaaaaaa aaaaaaaa] a
+    {
+        aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa
+        aaaaaaaa aaaaaaaa aaaaaaaa
+    } a
+}
+
+mac!(aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa
+     aaaaaaaa aaaaaaaa);
+mac![aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa
+     aaaaaaaa aaaaaaaa];
+mac! {
+    aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa
+    aaaaaaaa aaaaaaaa
+}
+
+#[rustc_dummy(aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa
+              aaaaaaaa aaaaaaaa aaaaaaaa)]
+#[rustc_dummy[aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa
+              aaaaaaaa aaaaaaaa aaaaaaaa]]
+#[rustc_dummy {
+      aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa
+      aaaaaaaa aaaaaaaa
+  }]
+#[rustc_dummy =
+  "aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa"]
+fn main() { }

src/test/pretty/stmt_expr_attributes.rs

@@ -111,9 +111,7 @@ fn _8() {
 }
 
 fn _9() {
-    macro_rules!
+    macro_rules! stmt_mac { () => { let _ = () ; } }
-    stmt_mac
-    {() => {let _ = () ; } }
 
     #[rustc_dummy]
     stmt_mac!();

src/test/run-make-fulldeps/pretty-expanded-hygiene/input.pp.rs

@@ -1,9 +1,9 @@
 // minimal junk
-#![feature(no_core)]
+#![feature /* 0#0 */(no_core)]
-#![no_core]
+#![no_core /* 0#0 */]
 
-macro_rules! foo /* 60#0 */(( $ x : ident ) => { y + $ x });
+macro_rules /* 0#0 */! foo /* 0#0 */ { ($ x : ident) => { y + $ x } }
 
-fn bar /* 62#0 */() { let x /* 59#2 */ = 1; y /* 61#4 */ + x /* 59#5 */ }
+fn bar /* 0#0 */() { let x /* 0#0 */ = 1; y /* 0#1 */ + x /* 0#0 */ }
 
-fn y /* 61#0 */() { }
+fn y /* 0#0 */() { }

src/test/ui/macro_backtrace/main.stderr

@@ -25,7 +25,7 @@ LL |       ping!();
   ::: <::ping::ping macros>:1:1
    |
 LL |   () => { pong ! () ; }
-   |   --------------------
+   |   ---------------------
    |   |       |
    |   |       in this macro invocation
    |   in this expansion of `ping!`
@@ -45,7 +45,7 @@ LL |       deep!();
   ::: <::ping::deep macros>:1:1
    |
 LL |   () => { foo ! () ; }
-   |   -------------------
+   |   --------------------
    |   |       |
    |   |       in this macro invocation (#2)
    |   in this expansion of `deep!` (#1)
@@ -53,7 +53,7 @@ LL |   () => {foo ! () ; }
   ::: <::ping::foo macros>:1:1
    |
 LL |   () => { bar ! () ; }
-   |   -------------------
+   |   --------------------
    |   |       |
    |   |       in this macro invocation (#3)
    |   in this expansion of `foo!` (#2)
@@ -61,7 +61,7 @@ LL |   () => {bar ! () ; }
   ::: <::ping::bar macros>:1:1
    |
 LL |   () => { ping ! () ; }
-   |   --------------------
+   |   ---------------------
    |   |       |
    |   |       in this macro invocation (#4)
    |   in this expansion of `bar!` (#3)
@@ -69,7 +69,7 @@ LL |   () => {ping ! () ; }
   ::: <::ping::ping macros>:1:1
    |
 LL |   () => { pong ! () ; }
-   |   --------------------
+   |   ---------------------
    |   |       |
    |   |       in this macro invocation (#5)
    |   in this expansion of `ping!` (#4)