mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pretty-print: Do not lose the $crate printing flag in print_tt

Browse Source
This commit is contained in:
Vadim Petrochenkov 2019-07-11 02:01:45 +03:00
parent 69070058cd
commit da50d59881
6 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libsyntax/print/pprust.rs
View File

@ -689,7 +689,7 @@ pub trait PrintState<'a>: std::ops::Deref<Target=pp::Printer> + std::ops::DerefM
TokenTree::Delimited(_, delim, tts) => { TokenTree::Delimited(_, delim, tts) => {
self.word(token_kind_to_string(&token::OpenDelim(delim))); self.word(token_kind_to_string(&token::OpenDelim(delim)));
self.space(); self.space();
self.print_tts(tts); self.print_tts(tts, convert_dollar_crate);
self.space(); self.space();
self.word(token_kind_to_string(&token::CloseDelim(delim))) self.word(token_kind_to_string(&token::CloseDelim(delim)))
}, },

10
src/test/ui/macros/auxiliary/dollar-crate-nested-encoding.rs Normal file
View File

@ -0,0 +1,10 @@
pub type S = u8;
macro_rules! generate_exported { () => {
#[macro_export]
macro_rules! exported {
() => ($crate::S)
}
}}
generate_exported!();

8
src/test/ui/macros/dollar-crate-nested-encoding.rs Normal file
View File

@ -0,0 +1,8 @@
// check-pass
// aux-build:dollar-crate-nested-encoding.rs
extern crate dollar_crate_nested_encoding;
type A = dollar_crate_nested_encoding::exported!();
fn main() {}

4
src/test/ui/proc-macro/dollar-crate-issue-57089.stdout
View File

@ -1,4 +1,4 @@
PRINT-BANG INPUT (DISPLAY): struct M ( crate :: S ) ; PRINT-BANG INPUT (DISPLAY): struct M ( $crate :: S ) ;
PRINT-BANG INPUT (DEBUG): TokenStream [ PRINT-BANG INPUT (DEBUG): TokenStream [
Ident { Ident {
ident: "struct", ident: "struct",
@ -39,7 +39,7 @@ PRINT-BANG INPUT (DEBUG): TokenStream [
}, },
] ]
PRINT-ATTR INPUT (DISPLAY): struct A(crate::S); PRINT-ATTR INPUT (DISPLAY): struct A(crate::S);
PRINT-ATTR RE-COLLECTED (DISPLAY): struct A ( crate :: S ) ; PRINT-ATTR RE-COLLECTED (DISPLAY): struct A ( $crate :: S ) ;
PRINT-ATTR INPUT (DEBUG): TokenStream [ PRINT-ATTR INPUT (DEBUG): TokenStream [
Ident { Ident {
ident: "struct", ident: "struct",

4
src/test/ui/proc-macro/dollar-crate-issue-62325.stdout
View File

@ -1,5 +1,5 @@
PRINT-ATTR INPUT (DISPLAY): struct A(identity!(crate :: S)); PRINT-ATTR INPUT (DISPLAY): struct A(identity!(crate :: S));
PRINT-ATTR RE-COLLECTED (DISPLAY): struct A ( identity ! ( crate :: S ) ) ; PRINT-ATTR RE-COLLECTED (DISPLAY): struct A ( identity ! ( $crate :: S ) ) ;
PRINT-ATTR INPUT (DEBUG): TokenStream [ PRINT-ATTR INPUT (DEBUG): TokenStream [
Ident { Ident {
ident: "struct", ident: "struct",
@ -55,7 +55,7 @@ PRINT-ATTR INPUT (DEBUG): TokenStream [
}, },
] ]
PRINT-ATTR INPUT (DISPLAY): struct B(identity!(::dollar_crate_external :: S)); PRINT-ATTR INPUT (DISPLAY): struct B(identity!(::dollar_crate_external :: S));
PRINT-ATTR RE-COLLECTED (DISPLAY): struct B ( identity ! ( ::dollar_crate_external :: S ) ) ; PRINT-ATTR RE-COLLECTED (DISPLAY): struct B ( identity ! ( $crate :: S ) ) ;
PRINT-ATTR INPUT (DEBUG): TokenStream [ PRINT-ATTR INPUT (DEBUG): TokenStream [
Ident { Ident {
ident: "struct", ident: "struct",

12
src/test/ui/proc-macro/dollar-crate.stdout
View File

@ -1,4 +1,4 @@
PRINT-BANG INPUT (DISPLAY): struct M ( crate :: S ) ; PRINT-BANG INPUT (DISPLAY): struct M ( $crate :: S ) ;
PRINT-BANG INPUT (DEBUG): TokenStream [ PRINT-BANG INPUT (DEBUG): TokenStream [
Ident { Ident {
ident: "struct", ident: "struct",
@ -39,7 +39,7 @@ PRINT-BANG INPUT (DEBUG): TokenStream [
}, },
] ]
PRINT-ATTR INPUT (DISPLAY): struct A(crate::S); PRINT-ATTR INPUT (DISPLAY): struct A(crate::S);
PRINT-ATTR RE-COLLECTED (DISPLAY): struct A ( crate :: S ) ; PRINT-ATTR RE-COLLECTED (DISPLAY): struct A ( $crate :: S ) ;
PRINT-ATTR INPUT (DEBUG): TokenStream [ PRINT-ATTR INPUT (DEBUG): TokenStream [
Ident { Ident {
ident: "struct", ident: "struct",
@ -80,7 +80,7 @@ PRINT-ATTR INPUT (DEBUG): TokenStream [
}, },
] ]
PRINT-DERIVE INPUT (DISPLAY): struct D(crate::S); PRINT-DERIVE INPUT (DISPLAY): struct D(crate::S);
PRINT-DERIVE RE-COLLECTED (DISPLAY): struct D ( crate :: S ) ; PRINT-DERIVE RE-COLLECTED (DISPLAY): struct D ( $crate :: S ) ;
PRINT-DERIVE INPUT (DEBUG): TokenStream [ PRINT-DERIVE INPUT (DEBUG): TokenStream [
Ident { Ident {
ident: "struct", ident: "struct",
@ -120,7 +120,7 @@ PRINT-DERIVE INPUT (DEBUG): TokenStream [
span: #2 bytes(LO..HI), span: #2 bytes(LO..HI),
}, },
] ]
PRINT-BANG INPUT (DISPLAY): struct M ( ::dollar_crate_external :: S ) ; PRINT-BANG INPUT (DISPLAY): struct M ( $crate :: S ) ;
PRINT-BANG INPUT (DEBUG): TokenStream [ PRINT-BANG INPUT (DEBUG): TokenStream [
Ident { Ident {
ident: "struct", ident: "struct",
@ -161,7 +161,7 @@ PRINT-BANG INPUT (DEBUG): TokenStream [
}, },
] ]
PRINT-ATTR INPUT (DISPLAY): struct A(::dollar_crate_external::S); PRINT-ATTR INPUT (DISPLAY): struct A(::dollar_crate_external::S);
PRINT-ATTR RE-COLLECTED (DISPLAY): struct A ( ::dollar_crate_external :: S ) ; PRINT-ATTR RE-COLLECTED (DISPLAY): struct A ( $crate :: S ) ;
PRINT-ATTR INPUT (DEBUG): TokenStream [ PRINT-ATTR INPUT (DEBUG): TokenStream [
Ident { Ident {
ident: "struct", ident: "struct",
@ -202,7 +202,7 @@ PRINT-ATTR INPUT (DEBUG): TokenStream [
}, },
] ]
PRINT-DERIVE INPUT (DISPLAY): struct D(::dollar_crate_external::S); PRINT-DERIVE INPUT (DISPLAY): struct D(::dollar_crate_external::S);
PRINT-DERIVE RE-COLLECTED (DISPLAY): struct D ( ::dollar_crate_external :: S ) ; PRINT-DERIVE RE-COLLECTED (DISPLAY): struct D ( $crate :: S ) ;
PRINT-DERIVE INPUT (DEBUG): TokenStream [ PRINT-DERIVE INPUT (DEBUG): TokenStream [
Ident { Ident {
ident: "struct", ident: "struct",