mirror of
https://github.com/rust-lang/rust.git
synced 2025-11-01 13:34:38 +00:00
f7d49fdf4f
Instead of using AST pretty printing. This is a step towards removing `token::Interpolated`, which will eventually (in #124141) be replaced with a token stream within invisible delimiters. This changes (improves) the output of the `stringify!` macro in some cases. This is allowed. As the `stringify!` docs say: "Note that the expanded results of the input tokens may change in the future. You should be careful if you rely on the output." Test changes: - tests/ui/macros/stringify.rs: this used to test both token stream pretty printing and AST pretty printing via different ways of invoking of `stringify!` (i.e. `$expr` vs `$tt`). But those two different invocations now give the same result, which is a nice consistency improvement. This removes the need for all the `c2*` macros. The AST pretty printer now has more thorough testing thanks to #125236. - tests/ui/proc-macro/*: minor improvements where small differences between `INPUT (DISPLAY)` output and `DEEP-RE-COLLECTED (DISPLAY)` output disappear.
536 lines
18 KiB
Plaintext
536 lines
18 KiB
Plaintext
PRINT-DERIVE INPUT (DISPLAY): enum E { V = { let _ = #[allow(warnings)] #[allow(warnings)] 0; 0 }, }
|
|
PRINT-DERIVE INPUT (DEBUG): TokenStream [
|
|
Ident {
|
|
ident: "enum",
|
|
span: #3 bytes(301..305),
|
|
},
|
|
Ident {
|
|
ident: "E",
|
|
span: #3 bytes(306..307),
|
|
},
|
|
Group {
|
|
delimiter: Brace,
|
|
stream: TokenStream [
|
|
Ident {
|
|
ident: "V",
|
|
span: #3 bytes(322..323),
|
|
},
|
|
Punct {
|
|
ch: '=',
|
|
spacing: Alone,
|
|
span: #3 bytes(324..325),
|
|
},
|
|
Group {
|
|
delimiter: Brace,
|
|
stream: TokenStream [
|
|
Ident {
|
|
ident: "let",
|
|
span: #3 bytes(328..331),
|
|
},
|
|
Ident {
|
|
ident: "_",
|
|
span: #3 bytes(332..333),
|
|
},
|
|
Punct {
|
|
ch: '=',
|
|
spacing: Alone,
|
|
span: #3 bytes(334..335),
|
|
},
|
|
Group {
|
|
delimiter: None,
|
|
stream: TokenStream [
|
|
Punct {
|
|
ch: '#',
|
|
spacing: Alone,
|
|
span: #0 bytes(543..544),
|
|
},
|
|
Group {
|
|
delimiter: Bracket,
|
|
stream: TokenStream [
|
|
Ident {
|
|
ident: "allow",
|
|
span: #0 bytes(545..550),
|
|
},
|
|
Group {
|
|
delimiter: Parenthesis,
|
|
stream: TokenStream [
|
|
Ident {
|
|
ident: "warnings",
|
|
span: #0 bytes(551..559),
|
|
},
|
|
],
|
|
span: #0 bytes(550..560),
|
|
},
|
|
],
|
|
span: #0 bytes(544..561),
|
|
},
|
|
Punct {
|
|
ch: '#',
|
|
spacing: Alone,
|
|
span: #0 bytes(543..544),
|
|
},
|
|
Group {
|
|
delimiter: Bracket,
|
|
stream: TokenStream [
|
|
Ident {
|
|
ident: "allow",
|
|
span: #0 bytes(545..550),
|
|
},
|
|
Group {
|
|
delimiter: Parenthesis,
|
|
stream: TokenStream [
|
|
Ident {
|
|
ident: "warnings",
|
|
span: #0 bytes(551..559),
|
|
},
|
|
],
|
|
span: #0 bytes(550..560),
|
|
},
|
|
],
|
|
span: #0 bytes(544..561),
|
|
},
|
|
Literal {
|
|
kind: Integer,
|
|
symbol: "0",
|
|
suffix: None,
|
|
span: #0 bytes(562..563),
|
|
},
|
|
],
|
|
span: #3 bytes(336..341),
|
|
},
|
|
Punct {
|
|
ch: ';',
|
|
spacing: Alone,
|
|
span: #3 bytes(341..342),
|
|
},
|
|
Literal {
|
|
kind: Integer,
|
|
symbol: "0",
|
|
suffix: None,
|
|
span: #3 bytes(343..344),
|
|
},
|
|
],
|
|
span: #3 bytes(326..346),
|
|
},
|
|
Punct {
|
|
ch: ',',
|
|
spacing: Alone,
|
|
span: #3 bytes(346..347),
|
|
},
|
|
],
|
|
span: #3 bytes(308..357),
|
|
},
|
|
]
|
|
PRINT-DERIVE INPUT (DISPLAY): enum E { V = { let _ = { 0 }; 0 }, }
|
|
PRINT-DERIVE INPUT (DEBUG): TokenStream [
|
|
Ident {
|
|
ident: "enum",
|
|
span: #7 bytes(425..429),
|
|
},
|
|
Ident {
|
|
ident: "E",
|
|
span: #7 bytes(430..431),
|
|
},
|
|
Group {
|
|
delimiter: Brace,
|
|
stream: TokenStream [
|
|
Ident {
|
|
ident: "V",
|
|
span: #7 bytes(446..447),
|
|
},
|
|
Punct {
|
|
ch: '=',
|
|
spacing: Alone,
|
|
span: #7 bytes(448..449),
|
|
},
|
|
Group {
|
|
delimiter: Brace,
|
|
stream: TokenStream [
|
|
Ident {
|
|
ident: "let",
|
|
span: #7 bytes(452..455),
|
|
},
|
|
Ident {
|
|
ident: "_",
|
|
span: #7 bytes(456..457),
|
|
},
|
|
Punct {
|
|
ch: '=',
|
|
spacing: Alone,
|
|
span: #7 bytes(458..459),
|
|
},
|
|
Group {
|
|
delimiter: Brace,
|
|
stream: TokenStream [
|
|
Group {
|
|
delimiter: None,
|
|
stream: TokenStream [
|
|
Literal {
|
|
kind: Integer,
|
|
symbol: "0",
|
|
suffix: None,
|
|
span: #0 bytes(580..581),
|
|
},
|
|
],
|
|
span: #7 bytes(462..467),
|
|
},
|
|
],
|
|
span: #7 bytes(460..469),
|
|
},
|
|
Punct {
|
|
ch: ';',
|
|
spacing: Alone,
|
|
span: #7 bytes(469..470),
|
|
},
|
|
Literal {
|
|
kind: Integer,
|
|
symbol: "0",
|
|
suffix: None,
|
|
span: #7 bytes(471..472),
|
|
},
|
|
],
|
|
span: #7 bytes(450..474),
|
|
},
|
|
Punct {
|
|
ch: ',',
|
|
spacing: Alone,
|
|
span: #7 bytes(474..475),
|
|
},
|
|
],
|
|
span: #7 bytes(432..485),
|
|
},
|
|
]
|
|
PRINT-DERIVE INPUT (DISPLAY): enum E { V = { let _ = { {} }; 0 }, }
|
|
PRINT-DERIVE INPUT (DEBUG): TokenStream [
|
|
Ident {
|
|
ident: "enum",
|
|
span: #11 bytes(425..429),
|
|
},
|
|
Ident {
|
|
ident: "E",
|
|
span: #11 bytes(430..431),
|
|
},
|
|
Group {
|
|
delimiter: Brace,
|
|
stream: TokenStream [
|
|
Ident {
|
|
ident: "V",
|
|
span: #11 bytes(446..447),
|
|
},
|
|
Punct {
|
|
ch: '=',
|
|
spacing: Alone,
|
|
span: #11 bytes(448..449),
|
|
},
|
|
Group {
|
|
delimiter: Brace,
|
|
stream: TokenStream [
|
|
Ident {
|
|
ident: "let",
|
|
span: #11 bytes(452..455),
|
|
},
|
|
Ident {
|
|
ident: "_",
|
|
span: #11 bytes(456..457),
|
|
},
|
|
Punct {
|
|
ch: '=',
|
|
spacing: Alone,
|
|
span: #11 bytes(458..459),
|
|
},
|
|
Group {
|
|
delimiter: Brace,
|
|
stream: TokenStream [
|
|
Group {
|
|
delimiter: None,
|
|
stream: TokenStream [
|
|
Group {
|
|
delimiter: Brace,
|
|
stream: TokenStream [],
|
|
span: #0 bytes(598..600),
|
|
},
|
|
],
|
|
span: #11 bytes(462..467),
|
|
},
|
|
],
|
|
span: #11 bytes(460..469),
|
|
},
|
|
Punct {
|
|
ch: ';',
|
|
spacing: Alone,
|
|
span: #11 bytes(469..470),
|
|
},
|
|
Literal {
|
|
kind: Integer,
|
|
symbol: "0",
|
|
suffix: None,
|
|
span: #11 bytes(471..472),
|
|
},
|
|
],
|
|
span: #11 bytes(450..474),
|
|
},
|
|
Punct {
|
|
ch: ',',
|
|
spacing: Alone,
|
|
span: #11 bytes(474..475),
|
|
},
|
|
],
|
|
span: #11 bytes(432..485),
|
|
},
|
|
]
|
|
PRINT-DERIVE INPUT (DISPLAY): enum E { V = { let _ = { PATH }; 0 }, }
|
|
PRINT-DERIVE INPUT (DEBUG): TokenStream [
|
|
Ident {
|
|
ident: "enum",
|
|
span: #15 bytes(425..429),
|
|
},
|
|
Ident {
|
|
ident: "E",
|
|
span: #15 bytes(430..431),
|
|
},
|
|
Group {
|
|
delimiter: Brace,
|
|
stream: TokenStream [
|
|
Ident {
|
|
ident: "V",
|
|
span: #15 bytes(446..447),
|
|
},
|
|
Punct {
|
|
ch: '=',
|
|
spacing: Alone,
|
|
span: #15 bytes(448..449),
|
|
},
|
|
Group {
|
|
delimiter: Brace,
|
|
stream: TokenStream [
|
|
Ident {
|
|
ident: "let",
|
|
span: #15 bytes(452..455),
|
|
},
|
|
Ident {
|
|
ident: "_",
|
|
span: #15 bytes(456..457),
|
|
},
|
|
Punct {
|
|
ch: '=',
|
|
spacing: Alone,
|
|
span: #15 bytes(458..459),
|
|
},
|
|
Group {
|
|
delimiter: Brace,
|
|
stream: TokenStream [
|
|
Group {
|
|
delimiter: None,
|
|
stream: TokenStream [
|
|
Ident {
|
|
ident: "PATH",
|
|
span: #0 bytes(617..621),
|
|
},
|
|
],
|
|
span: #15 bytes(462..467),
|
|
},
|
|
],
|
|
span: #15 bytes(460..469),
|
|
},
|
|
Punct {
|
|
ch: ';',
|
|
spacing: Alone,
|
|
span: #15 bytes(469..470),
|
|
},
|
|
Literal {
|
|
kind: Integer,
|
|
symbol: "0",
|
|
suffix: None,
|
|
span: #15 bytes(471..472),
|
|
},
|
|
],
|
|
span: #15 bytes(450..474),
|
|
},
|
|
Punct {
|
|
ch: ',',
|
|
spacing: Alone,
|
|
span: #15 bytes(474..475),
|
|
},
|
|
],
|
|
span: #15 bytes(432..485),
|
|
},
|
|
]
|
|
PRINT-DERIVE INPUT (DISPLAY): enum E { V = { let _ = { 0 + 1 }; 0 }, }
|
|
PRINT-DERIVE INPUT (DEBUG): TokenStream [
|
|
Ident {
|
|
ident: "enum",
|
|
span: #19 bytes(425..429),
|
|
},
|
|
Ident {
|
|
ident: "E",
|
|
span: #19 bytes(430..431),
|
|
},
|
|
Group {
|
|
delimiter: Brace,
|
|
stream: TokenStream [
|
|
Ident {
|
|
ident: "V",
|
|
span: #19 bytes(446..447),
|
|
},
|
|
Punct {
|
|
ch: '=',
|
|
spacing: Alone,
|
|
span: #19 bytes(448..449),
|
|
},
|
|
Group {
|
|
delimiter: Brace,
|
|
stream: TokenStream [
|
|
Ident {
|
|
ident: "let",
|
|
span: #19 bytes(452..455),
|
|
},
|
|
Ident {
|
|
ident: "_",
|
|
span: #19 bytes(456..457),
|
|
},
|
|
Punct {
|
|
ch: '=',
|
|
spacing: Alone,
|
|
span: #19 bytes(458..459),
|
|
},
|
|
Group {
|
|
delimiter: Brace,
|
|
stream: TokenStream [
|
|
Group {
|
|
delimiter: None,
|
|
stream: TokenStream [
|
|
Literal {
|
|
kind: Integer,
|
|
symbol: "0",
|
|
suffix: None,
|
|
span: #0 bytes(638..639),
|
|
},
|
|
Punct {
|
|
ch: '+',
|
|
spacing: Alone,
|
|
span: #0 bytes(640..641),
|
|
},
|
|
Literal {
|
|
kind: Integer,
|
|
symbol: "1",
|
|
suffix: None,
|
|
span: #0 bytes(642..643),
|
|
},
|
|
],
|
|
span: #19 bytes(462..467),
|
|
},
|
|
],
|
|
span: #19 bytes(460..469),
|
|
},
|
|
Punct {
|
|
ch: ';',
|
|
spacing: Alone,
|
|
span: #19 bytes(469..470),
|
|
},
|
|
Literal {
|
|
kind: Integer,
|
|
symbol: "0",
|
|
suffix: None,
|
|
span: #19 bytes(471..472),
|
|
},
|
|
],
|
|
span: #19 bytes(450..474),
|
|
},
|
|
Punct {
|
|
ch: ',',
|
|
spacing: Alone,
|
|
span: #19 bytes(474..475),
|
|
},
|
|
],
|
|
span: #19 bytes(432..485),
|
|
},
|
|
]
|
|
PRINT-DERIVE INPUT (DISPLAY): enum E { V = { let _ = { PATH + 1 }; 0 }, }
|
|
PRINT-DERIVE INPUT (DEBUG): TokenStream [
|
|
Ident {
|
|
ident: "enum",
|
|
span: #23 bytes(425..429),
|
|
},
|
|
Ident {
|
|
ident: "E",
|
|
span: #23 bytes(430..431),
|
|
},
|
|
Group {
|
|
delimiter: Brace,
|
|
stream: TokenStream [
|
|
Ident {
|
|
ident: "V",
|
|
span: #23 bytes(446..447),
|
|
},
|
|
Punct {
|
|
ch: '=',
|
|
spacing: Alone,
|
|
span: #23 bytes(448..449),
|
|
},
|
|
Group {
|
|
delimiter: Brace,
|
|
stream: TokenStream [
|
|
Ident {
|
|
ident: "let",
|
|
span: #23 bytes(452..455),
|
|
},
|
|
Ident {
|
|
ident: "_",
|
|
span: #23 bytes(456..457),
|
|
},
|
|
Punct {
|
|
ch: '=',
|
|
spacing: Alone,
|
|
span: #23 bytes(458..459),
|
|
},
|
|
Group {
|
|
delimiter: Brace,
|
|
stream: TokenStream [
|
|
Group {
|
|
delimiter: None,
|
|
stream: TokenStream [
|
|
Ident {
|
|
ident: "PATH",
|
|
span: #0 bytes(660..664),
|
|
},
|
|
Punct {
|
|
ch: '+',
|
|
spacing: Alone,
|
|
span: #0 bytes(665..666),
|
|
},
|
|
Literal {
|
|
kind: Integer,
|
|
symbol: "1",
|
|
suffix: None,
|
|
span: #0 bytes(667..668),
|
|
},
|
|
],
|
|
span: #23 bytes(462..467),
|
|
},
|
|
],
|
|
span: #23 bytes(460..469),
|
|
},
|
|
Punct {
|
|
ch: ';',
|
|
spacing: Alone,
|
|
span: #23 bytes(469..470),
|
|
},
|
|
Literal {
|
|
kind: Integer,
|
|
symbol: "0",
|
|
suffix: None,
|
|
span: #23 bytes(471..472),
|
|
},
|
|
],
|
|
span: #23 bytes(450..474),
|
|
},
|
|
Punct {
|
|
ch: ',',
|
|
spacing: Alone,
|
|
span: #23 bytes(474..475),
|
|
},
|
|
],
|
|
span: #23 bytes(432..485),
|
|
},
|
|
]
|