From 27a261be3ee99664c1f05eb1a17ec9e384da6d7b Mon Sep 17 00:00:00 2001 From: Vadim Chugunov Date: Thu, 22 Jan 2015 17:34:31 -0800 Subject: Suppress space after idents with "ModName" style in serialization of exported macros. Fixes issue #20701 --- src/libsyntax/print/pprust.rs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src/libsyntax') diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs index 42f156d6a11..dbe4241b8e6 100644 --- a/src/libsyntax/print/pprust.rs +++ b/src/libsyntax/print/pprust.rs @@ -1164,11 +1164,20 @@ impl<'a> State<'a> { pub fn print_tts(&mut self, tts: &[ast::TokenTree]) -> IoResult<()> { try!(self.ibox(0)); + let mut suppress_space = false; for (i, tt) in tts.iter().enumerate() { - if i != 0 { + if i != 0 && !suppress_space { try!(space(&mut self.s)); } try!(self.print_tt(tt)); + // There should be no space between the module name and the following `::` in paths, + // otherwise imported macros get re-parsed from crate metadata incorrectly (issue #20701) + suppress_space = match tt { + &ast::TtToken(_, token::Ident(_, token::ModName)) | + &ast::TtToken(_, token::MatchNt(_, _, _, token::ModName)) | + &ast::TtToken(_, token::SubstNt(_, token::ModName)) => true, + _ => false + } } self.end() } -- cgit 1.4.1-3-g733a5 From f09c680b4cc9cf9dad5cd0a73ed5dba767b5e925 Mon Sep 17 00:00:00 2001 From: Vadim Chugunov Date: Fri, 23 Jan 2015 11:27:16 -0800 Subject: Fix tidy. --- src/libsyntax/print/pprust.rs | 2 +- src/test/auxiliary/macro_with_super_1.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/libsyntax') diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs index dbe4241b8e6..d1cd7631c82 100644 --- a/src/libsyntax/print/pprust.rs +++ b/src/libsyntax/print/pprust.rs @@ -1171,7 +1171,7 @@ impl<'a> State<'a> { } try!(self.print_tt(tt)); // There should be no space between the module name and the following `::` in paths, - // otherwise imported macros get re-parsed from crate metadata incorrectly (issue #20701) + // otherwise imported macros get re-parsed from crate metadata incorrectly (#20701) suppress_space = match tt { &ast::TtToken(_, token::Ident(_, token::ModName)) | &ast::TtToken(_, token::MatchNt(_, _, _, token::ModName)) | diff --git a/src/test/auxiliary/macro_with_super_1.rs b/src/test/auxiliary/macro_with_super_1.rs index ac50be06ef7..fd2e52bb355 100644 --- a/src/test/auxiliary/macro_with_super_1.rs +++ b/src/test/auxiliary/macro_with_super_1.rs @@ -11,7 +11,7 @@ #![crate_type = "lib"] #[macro_export] -macro_rules! declare { +macro_rules! declare { () => ( pub fn aaa() {} -- cgit 1.4.1-3-g733a5