Properly format macro's with an extra ident

[rust.git] / src / macros.rs

diff --git a/src/macros.rs b/src/macros.rs
index 324c68d750af5e345c4457dd236b2a2e4758fb2f..7e321366abfd0aa17116f877e7139b5bc3b871c8 100644 (file)
--- a/src/macros.rs
+++ b/src/macros.rs
@@ -51,12 +51,16 @@ fn opener(&self) -> &'static str {
 }
 
 pub fn rewrite_macro(mac: &ast::Mac,
+                     extra_ident: Option<ast::Ident>,
                      context: &RewriteContext,
                      width: usize,
                      offset: Indent)
                      -> Option<String> {
     let original_style = macro_style(mac, context);
-    let macro_name = format!("{}!", mac.node.path);
+    let macro_name = match extra_ident {
+        None | Some(ast::Ident { name: ast::Name(0), .. }) => format!("{}!", mac.node.path),
+        Some(ident) => format!("{}! {}", mac.node.path, ident),
+    };
     let style = if FORCED_BRACKET_MACROS.contains(&&macro_name[..]) {
         MacroStyle::Brackets
     } else {