mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-23 23:34:48 +00:00
925f7fad57
`tokenstream::Spacing` appears on all `TokenTree::Token` instances, both punct and non-punct. Its current usage: - `Joint` means "can join with the next token *and* that token is a punct". - `Alone` means "cannot join with the next token *or* can join with the next token but that token is not a punct". The fact that `Alone` is used for two different cases is awkward. This commit augments `tokenstream::Spacing` with a new variant `JointHidden`, resulting in: - `Joint` means "can join with the next token *and* that token is a punct". - `JointHidden` means "can join with the next token *and* that token is a not a punct". - `Alone` means "cannot join with the next token". This *drastically* improves the output of `print_tts`. For example, this: ``` stringify!(let a: Vec<u32> = vec![];) ``` currently produces this string: ``` let a : Vec < u32 > = vec! [] ; ``` With this PR, it now produces this string: ``` let a: Vec<u32> = vec![] ; ``` (The space after the `]` is because `TokenTree::Delimited` currently doesn't have spacing information. The subsequent commit fixes this.) The new `print_tts` doesn't replicate original code perfectly. E.g. multiple space characters will be condensed into a single space character. But it's much improved. `print_tts` still produces the old, uglier output for code produced by proc macros. Because we have to translate the generated code from `proc_macro::Spacing` to the more expressive `token::Spacing`, which results in too much `proc_macro::Along` usage and no `proc_macro::JointHidden` usage. So `space_between` still exists and is used by `print_tts` in conjunction with the `Spacing` field. This change will also help with the removal of `Token::Interpolated`. Currently interpolated tokens are pretty-printed nicely via AST pretty printing. `Token::Interpolated` removal will mean they get printed with `print_tts`. Without this change, that would result in much uglier output for code produced by decl macro expansions. With this change, AST pretty printing and `print_tts` produce similar results. The commit also tweaks the comments on `proc_macro::Spacing`. In particular, it refers to "compound tokens" rather than "multi-char operators" because lifetimes aren't operators.
551 lines
16 KiB
Plaintext
551 lines
16 KiB
Plaintext
PRINT-ATTR_ARGS INPUT (DISPLAY): first_outer
|
|
PRINT-ATTR_ARGS INPUT (DEBUG): TokenStream [
|
|
Ident {
|
|
ident: "first_outer",
|
|
span: $DIR/weird-braces.rs:16:25: 16:36 (#0),
|
|
},
|
|
]
|
|
PRINT-ATTR INPUT (DISPLAY): #[print_target_and_args(second_outer)] impl Bar<{ 1 > 0 } > for Foo<{ true } >
|
|
{
|
|
#![print_target_and_args(first_inner)]
|
|
#![print_target_and_args(second_inner)]
|
|
}
|
|
PRINT-ATTR RE-COLLECTED (DISPLAY): #[print_target_and_args(second_outer)] impl Bar < { 1 > 0 } > for Foo <
|
|
{ true } >
|
|
{
|
|
#![print_target_and_args(first_inner)]
|
|
#![print_target_and_args(second_inner)]
|
|
}
|
|
PRINT-ATTR DEEP-RE-COLLECTED (DISPLAY): #[print_target_and_args(second_outer)] impl Bar < { 1 > 0 } > for Foo <
|
|
{ true } >
|
|
{
|
|
#! [print_target_and_args(first_inner)] #!
|
|
[print_target_and_args(second_inner)]
|
|
}
|
|
PRINT-ATTR INPUT (DEBUG): TokenStream [
|
|
Punct {
|
|
ch: '#',
|
|
spacing: Alone,
|
|
span: $DIR/weird-braces.rs:17:1: 17:2 (#0),
|
|
},
|
|
Group {
|
|
delimiter: Bracket,
|
|
stream: TokenStream [
|
|
Ident {
|
|
ident: "print_target_and_args",
|
|
span: $DIR/weird-braces.rs:17:3: 17:24 (#0),
|
|
},
|
|
Group {
|
|
delimiter: Parenthesis,
|
|
stream: TokenStream [
|
|
Ident {
|
|
ident: "second_outer",
|
|
span: $DIR/weird-braces.rs:17:25: 17:37 (#0),
|
|
},
|
|
],
|
|
span: $DIR/weird-braces.rs:17:24: 17:38 (#0),
|
|
},
|
|
],
|
|
span: $DIR/weird-braces.rs:17:2: 17:39 (#0),
|
|
},
|
|
Ident {
|
|
ident: "impl",
|
|
span: $DIR/weird-braces.rs:18:1: 18:5 (#0),
|
|
},
|
|
Ident {
|
|
ident: "Bar",
|
|
span: $DIR/weird-braces.rs:18:6: 18:9 (#0),
|
|
},
|
|
Punct {
|
|
ch: '<',
|
|
spacing: Alone,
|
|
span: $DIR/weird-braces.rs:18:9: 18:10 (#0),
|
|
},
|
|
Group {
|
|
delimiter: Brace,
|
|
stream: TokenStream [
|
|
Literal {
|
|
kind: Integer,
|
|
symbol: "1",
|
|
suffix: None,
|
|
span: $DIR/weird-braces.rs:18:11: 18:12 (#0),
|
|
},
|
|
Punct {
|
|
ch: '>',
|
|
spacing: Alone,
|
|
span: $DIR/weird-braces.rs:18:13: 18:14 (#0),
|
|
},
|
|
Literal {
|
|
kind: Integer,
|
|
symbol: "0",
|
|
suffix: None,
|
|
span: $DIR/weird-braces.rs:18:15: 18:16 (#0),
|
|
},
|
|
],
|
|
span: $DIR/weird-braces.rs:18:10: 18:17 (#0),
|
|
},
|
|
Punct {
|
|
ch: '>',
|
|
spacing: Alone,
|
|
span: $DIR/weird-braces.rs:18:17: 18:18 (#0),
|
|
},
|
|
Ident {
|
|
ident: "for",
|
|
span: $DIR/weird-braces.rs:18:19: 18:22 (#0),
|
|
},
|
|
Ident {
|
|
ident: "Foo",
|
|
span: $DIR/weird-braces.rs:18:23: 18:26 (#0),
|
|
},
|
|
Punct {
|
|
ch: '<',
|
|
spacing: Alone,
|
|
span: $DIR/weird-braces.rs:18:26: 18:27 (#0),
|
|
},
|
|
Group {
|
|
delimiter: Brace,
|
|
stream: TokenStream [
|
|
Ident {
|
|
ident: "true",
|
|
span: $DIR/weird-braces.rs:18:28: 18:32 (#0),
|
|
},
|
|
],
|
|
span: $DIR/weird-braces.rs:18:27: 18:33 (#0),
|
|
},
|
|
Punct {
|
|
ch: '>',
|
|
spacing: Alone,
|
|
span: $DIR/weird-braces.rs:18:33: 18:34 (#0),
|
|
},
|
|
Group {
|
|
delimiter: Brace,
|
|
stream: TokenStream [
|
|
Punct {
|
|
ch: '#',
|
|
spacing: Joint,
|
|
span: $DIR/weird-braces.rs:19:5: 19:6 (#0),
|
|
},
|
|
Punct {
|
|
ch: '!',
|
|
spacing: Alone,
|
|
span: $DIR/weird-braces.rs:19:6: 19:7 (#0),
|
|
},
|
|
Group {
|
|
delimiter: Bracket,
|
|
stream: TokenStream [
|
|
Ident {
|
|
ident: "print_target_and_args",
|
|
span: $DIR/weird-braces.rs:19:8: 19:29 (#0),
|
|
},
|
|
Group {
|
|
delimiter: Parenthesis,
|
|
stream: TokenStream [
|
|
Ident {
|
|
ident: "first_inner",
|
|
span: $DIR/weird-braces.rs:19:30: 19:41 (#0),
|
|
},
|
|
],
|
|
span: $DIR/weird-braces.rs:19:29: 19:42 (#0),
|
|
},
|
|
],
|
|
span: $DIR/weird-braces.rs:19:7: 19:43 (#0),
|
|
},
|
|
Punct {
|
|
ch: '#',
|
|
spacing: Joint,
|
|
span: $DIR/weird-braces.rs:20:5: 20:6 (#0),
|
|
},
|
|
Punct {
|
|
ch: '!',
|
|
spacing: Alone,
|
|
span: $DIR/weird-braces.rs:20:6: 20:7 (#0),
|
|
},
|
|
Group {
|
|
delimiter: Bracket,
|
|
stream: TokenStream [
|
|
Ident {
|
|
ident: "print_target_and_args",
|
|
span: $DIR/weird-braces.rs:20:8: 20:29 (#0),
|
|
},
|
|
Group {
|
|
delimiter: Parenthesis,
|
|
stream: TokenStream [
|
|
Ident {
|
|
ident: "second_inner",
|
|
span: $DIR/weird-braces.rs:20:30: 20:42 (#0),
|
|
},
|
|
],
|
|
span: $DIR/weird-braces.rs:20:29: 20:43 (#0),
|
|
},
|
|
],
|
|
span: $DIR/weird-braces.rs:20:7: 20:44 (#0),
|
|
},
|
|
],
|
|
span: $DIR/weird-braces.rs:18:35: 21:2 (#0),
|
|
},
|
|
]
|
|
PRINT-ATTR_ARGS INPUT (DISPLAY): second_outer
|
|
PRINT-ATTR_ARGS INPUT (DEBUG): TokenStream [
|
|
Ident {
|
|
ident: "second_outer",
|
|
span: $DIR/weird-braces.rs:17:25: 17:37 (#0),
|
|
},
|
|
]
|
|
PRINT-ATTR INPUT (DISPLAY): impl Bar<{ 1 > 0 } > for Foo<{ true } >
|
|
{
|
|
#![print_target_and_args(first_inner)]
|
|
#![print_target_and_args(second_inner)]
|
|
}
|
|
PRINT-ATTR RE-COLLECTED (DISPLAY): impl Bar < { 1 > 0 } > for Foo < { true } >
|
|
{
|
|
#![print_target_and_args(first_inner)]
|
|
#![print_target_and_args(second_inner)]
|
|
}
|
|
PRINT-ATTR DEEP-RE-COLLECTED (DISPLAY): impl Bar < { 1 > 0 } > for Foo < { true } >
|
|
{
|
|
#! [print_target_and_args(first_inner)] #!
|
|
[print_target_and_args(second_inner)]
|
|
}
|
|
PRINT-ATTR INPUT (DEBUG): TokenStream [
|
|
Ident {
|
|
ident: "impl",
|
|
span: $DIR/weird-braces.rs:18:1: 18:5 (#0),
|
|
},
|
|
Ident {
|
|
ident: "Bar",
|
|
span: $DIR/weird-braces.rs:18:6: 18:9 (#0),
|
|
},
|
|
Punct {
|
|
ch: '<',
|
|
spacing: Alone,
|
|
span: $DIR/weird-braces.rs:18:9: 18:10 (#0),
|
|
},
|
|
Group {
|
|
delimiter: Brace,
|
|
stream: TokenStream [
|
|
Literal {
|
|
kind: Integer,
|
|
symbol: "1",
|
|
suffix: None,
|
|
span: $DIR/weird-braces.rs:18:11: 18:12 (#0),
|
|
},
|
|
Punct {
|
|
ch: '>',
|
|
spacing: Alone,
|
|
span: $DIR/weird-braces.rs:18:13: 18:14 (#0),
|
|
},
|
|
Literal {
|
|
kind: Integer,
|
|
symbol: "0",
|
|
suffix: None,
|
|
span: $DIR/weird-braces.rs:18:15: 18:16 (#0),
|
|
},
|
|
],
|
|
span: $DIR/weird-braces.rs:18:10: 18:17 (#0),
|
|
},
|
|
Punct {
|
|
ch: '>',
|
|
spacing: Alone,
|
|
span: $DIR/weird-braces.rs:18:17: 18:18 (#0),
|
|
},
|
|
Ident {
|
|
ident: "for",
|
|
span: $DIR/weird-braces.rs:18:19: 18:22 (#0),
|
|
},
|
|
Ident {
|
|
ident: "Foo",
|
|
span: $DIR/weird-braces.rs:18:23: 18:26 (#0),
|
|
},
|
|
Punct {
|
|
ch: '<',
|
|
spacing: Alone,
|
|
span: $DIR/weird-braces.rs:18:26: 18:27 (#0),
|
|
},
|
|
Group {
|
|
delimiter: Brace,
|
|
stream: TokenStream [
|
|
Ident {
|
|
ident: "true",
|
|
span: $DIR/weird-braces.rs:18:28: 18:32 (#0),
|
|
},
|
|
],
|
|
span: $DIR/weird-braces.rs:18:27: 18:33 (#0),
|
|
},
|
|
Punct {
|
|
ch: '>',
|
|
spacing: Alone,
|
|
span: $DIR/weird-braces.rs:18:33: 18:34 (#0),
|
|
},
|
|
Group {
|
|
delimiter: Brace,
|
|
stream: TokenStream [
|
|
Punct {
|
|
ch: '#',
|
|
spacing: Joint,
|
|
span: $DIR/weird-braces.rs:19:5: 19:6 (#0),
|
|
},
|
|
Punct {
|
|
ch: '!',
|
|
spacing: Alone,
|
|
span: $DIR/weird-braces.rs:19:6: 19:7 (#0),
|
|
},
|
|
Group {
|
|
delimiter: Bracket,
|
|
stream: TokenStream [
|
|
Ident {
|
|
ident: "print_target_and_args",
|
|
span: $DIR/weird-braces.rs:19:8: 19:29 (#0),
|
|
},
|
|
Group {
|
|
delimiter: Parenthesis,
|
|
stream: TokenStream [
|
|
Ident {
|
|
ident: "first_inner",
|
|
span: $DIR/weird-braces.rs:19:30: 19:41 (#0),
|
|
},
|
|
],
|
|
span: $DIR/weird-braces.rs:19:29: 19:42 (#0),
|
|
},
|
|
],
|
|
span: $DIR/weird-braces.rs:19:7: 19:43 (#0),
|
|
},
|
|
Punct {
|
|
ch: '#',
|
|
spacing: Joint,
|
|
span: $DIR/weird-braces.rs:20:5: 20:6 (#0),
|
|
},
|
|
Punct {
|
|
ch: '!',
|
|
spacing: Alone,
|
|
span: $DIR/weird-braces.rs:20:6: 20:7 (#0),
|
|
},
|
|
Group {
|
|
delimiter: Bracket,
|
|
stream: TokenStream [
|
|
Ident {
|
|
ident: "print_target_and_args",
|
|
span: $DIR/weird-braces.rs:20:8: 20:29 (#0),
|
|
},
|
|
Group {
|
|
delimiter: Parenthesis,
|
|
stream: TokenStream [
|
|
Ident {
|
|
ident: "second_inner",
|
|
span: $DIR/weird-braces.rs:20:30: 20:42 (#0),
|
|
},
|
|
],
|
|
span: $DIR/weird-braces.rs:20:29: 20:43 (#0),
|
|
},
|
|
],
|
|
span: $DIR/weird-braces.rs:20:7: 20:44 (#0),
|
|
},
|
|
],
|
|
span: $DIR/weird-braces.rs:18:35: 21:2 (#0),
|
|
},
|
|
]
|
|
PRINT-ATTR_ARGS INPUT (DISPLAY): first_inner
|
|
PRINT-ATTR_ARGS INPUT (DEBUG): TokenStream [
|
|
Ident {
|
|
ident: "first_inner",
|
|
span: $DIR/weird-braces.rs:19:30: 19:41 (#0),
|
|
},
|
|
]
|
|
PRINT-ATTR INPUT (DISPLAY): impl Bar<{ 1 > 0 } > for Foo<{ true } >
|
|
{ #![print_target_and_args(second_inner)] }
|
|
PRINT-ATTR RE-COLLECTED (DISPLAY): impl Bar < { 1 > 0 } > for Foo < { true } >
|
|
{ #![print_target_and_args(second_inner)] }
|
|
PRINT-ATTR DEEP-RE-COLLECTED (DISPLAY): impl Bar < { 1 > 0 } > for Foo < { true } >
|
|
{ #! [print_target_and_args(second_inner)] }
|
|
PRINT-ATTR INPUT (DEBUG): TokenStream [
|
|
Ident {
|
|
ident: "impl",
|
|
span: $DIR/weird-braces.rs:18:1: 18:5 (#0),
|
|
},
|
|
Ident {
|
|
ident: "Bar",
|
|
span: $DIR/weird-braces.rs:18:6: 18:9 (#0),
|
|
},
|
|
Punct {
|
|
ch: '<',
|
|
spacing: Alone,
|
|
span: $DIR/weird-braces.rs:18:9: 18:10 (#0),
|
|
},
|
|
Group {
|
|
delimiter: Brace,
|
|
stream: TokenStream [
|
|
Literal {
|
|
kind: Integer,
|
|
symbol: "1",
|
|
suffix: None,
|
|
span: $DIR/weird-braces.rs:18:11: 18:12 (#0),
|
|
},
|
|
Punct {
|
|
ch: '>',
|
|
spacing: Alone,
|
|
span: $DIR/weird-braces.rs:18:13: 18:14 (#0),
|
|
},
|
|
Literal {
|
|
kind: Integer,
|
|
symbol: "0",
|
|
suffix: None,
|
|
span: $DIR/weird-braces.rs:18:15: 18:16 (#0),
|
|
},
|
|
],
|
|
span: $DIR/weird-braces.rs:18:10: 18:17 (#0),
|
|
},
|
|
Punct {
|
|
ch: '>',
|
|
spacing: Alone,
|
|
span: $DIR/weird-braces.rs:18:17: 18:18 (#0),
|
|
},
|
|
Ident {
|
|
ident: "for",
|
|
span: $DIR/weird-braces.rs:18:19: 18:22 (#0),
|
|
},
|
|
Ident {
|
|
ident: "Foo",
|
|
span: $DIR/weird-braces.rs:18:23: 18:26 (#0),
|
|
},
|
|
Punct {
|
|
ch: '<',
|
|
spacing: Alone,
|
|
span: $DIR/weird-braces.rs:18:26: 18:27 (#0),
|
|
},
|
|
Group {
|
|
delimiter: Brace,
|
|
stream: TokenStream [
|
|
Ident {
|
|
ident: "true",
|
|
span: $DIR/weird-braces.rs:18:28: 18:32 (#0),
|
|
},
|
|
],
|
|
span: $DIR/weird-braces.rs:18:27: 18:33 (#0),
|
|
},
|
|
Punct {
|
|
ch: '>',
|
|
spacing: Alone,
|
|
span: $DIR/weird-braces.rs:18:33: 18:34 (#0),
|
|
},
|
|
Group {
|
|
delimiter: Brace,
|
|
stream: TokenStream [
|
|
Punct {
|
|
ch: '#',
|
|
spacing: Joint,
|
|
span: $DIR/weird-braces.rs:20:5: 20:6 (#0),
|
|
},
|
|
Punct {
|
|
ch: '!',
|
|
spacing: Alone,
|
|
span: $DIR/weird-braces.rs:20:6: 20:7 (#0),
|
|
},
|
|
Group {
|
|
delimiter: Bracket,
|
|
stream: TokenStream [
|
|
Ident {
|
|
ident: "print_target_and_args",
|
|
span: $DIR/weird-braces.rs:20:8: 20:29 (#0),
|
|
},
|
|
Group {
|
|
delimiter: Parenthesis,
|
|
stream: TokenStream [
|
|
Ident {
|
|
ident: "second_inner",
|
|
span: $DIR/weird-braces.rs:20:30: 20:42 (#0),
|
|
},
|
|
],
|
|
span: $DIR/weird-braces.rs:20:29: 20:43 (#0),
|
|
},
|
|
],
|
|
span: $DIR/weird-braces.rs:20:7: 20:44 (#0),
|
|
},
|
|
],
|
|
span: $DIR/weird-braces.rs:18:35: 21:2 (#0),
|
|
},
|
|
]
|
|
PRINT-ATTR_ARGS INPUT (DISPLAY): second_inner
|
|
PRINT-ATTR_ARGS INPUT (DEBUG): TokenStream [
|
|
Ident {
|
|
ident: "second_inner",
|
|
span: $DIR/weird-braces.rs:20:30: 20:42 (#0),
|
|
},
|
|
]
|
|
PRINT-ATTR INPUT (DISPLAY): impl Bar<{ 1 > 0 } > for Foo<{ true } > {}
|
|
PRINT-ATTR RE-COLLECTED (DISPLAY): impl Bar < { 1 > 0 } > for Foo < { true } > {}
|
|
PRINT-ATTR INPUT (DEBUG): TokenStream [
|
|
Ident {
|
|
ident: "impl",
|
|
span: $DIR/weird-braces.rs:18:1: 18:5 (#0),
|
|
},
|
|
Ident {
|
|
ident: "Bar",
|
|
span: $DIR/weird-braces.rs:18:6: 18:9 (#0),
|
|
},
|
|
Punct {
|
|
ch: '<',
|
|
spacing: Alone,
|
|
span: $DIR/weird-braces.rs:18:9: 18:10 (#0),
|
|
},
|
|
Group {
|
|
delimiter: Brace,
|
|
stream: TokenStream [
|
|
Literal {
|
|
kind: Integer,
|
|
symbol: "1",
|
|
suffix: None,
|
|
span: $DIR/weird-braces.rs:18:11: 18:12 (#0),
|
|
},
|
|
Punct {
|
|
ch: '>',
|
|
spacing: Alone,
|
|
span: $DIR/weird-braces.rs:18:13: 18:14 (#0),
|
|
},
|
|
Literal {
|
|
kind: Integer,
|
|
symbol: "0",
|
|
suffix: None,
|
|
span: $DIR/weird-braces.rs:18:15: 18:16 (#0),
|
|
},
|
|
],
|
|
span: $DIR/weird-braces.rs:18:10: 18:17 (#0),
|
|
},
|
|
Punct {
|
|
ch: '>',
|
|
spacing: Alone,
|
|
span: $DIR/weird-braces.rs:18:17: 18:18 (#0),
|
|
},
|
|
Ident {
|
|
ident: "for",
|
|
span: $DIR/weird-braces.rs:18:19: 18:22 (#0),
|
|
},
|
|
Ident {
|
|
ident: "Foo",
|
|
span: $DIR/weird-braces.rs:18:23: 18:26 (#0),
|
|
},
|
|
Punct {
|
|
ch: '<',
|
|
spacing: Alone,
|
|
span: $DIR/weird-braces.rs:18:26: 18:27 (#0),
|
|
},
|
|
Group {
|
|
delimiter: Brace,
|
|
stream: TokenStream [
|
|
Ident {
|
|
ident: "true",
|
|
span: $DIR/weird-braces.rs:18:28: 18:32 (#0),
|
|
},
|
|
],
|
|
span: $DIR/weird-braces.rs:18:27: 18:33 (#0),
|
|
},
|
|
Punct {
|
|
ch: '>',
|
|
spacing: Alone,
|
|
span: $DIR/weird-braces.rs:18:33: 18:34 (#0),
|
|
},
|
|
Group {
|
|
delimiter: Brace,
|
|
stream: TokenStream [],
|
|
span: $DIR/weird-braces.rs:18:35: 21:2 (#0),
|
|
},
|
|
]
|