mirror of
https://github.com/rust-lang/rust
synced 2024-09-30 22:04:36 +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.
88 lines
3.6 KiB
Plaintext
88 lines
3.6 KiB
Plaintext
PRINT-BANG INPUT (DISPLAY): foo! { #[fake_attr] mod bar {
|
|
#![doc = r" Foo"]
|
|
} }
|
|
PRINT-BANG DEEP-RE-COLLECTED (DISPLAY): foo! { #[fake_attr] mod bar { #! [doc = r" Foo"] } }
|
|
PRINT-BANG INPUT (DEBUG): TokenStream [
|
|
Ident {
|
|
ident: "foo",
|
|
span: $DIR/issue-78675-captured-inner-attrs.rs:20:9: 20:12 (#3),
|
|
},
|
|
Punct {
|
|
ch: '!',
|
|
spacing: Alone,
|
|
span: $DIR/issue-78675-captured-inner-attrs.rs:20:12: 20:13 (#3),
|
|
},
|
|
Group {
|
|
delimiter: Brace,
|
|
stream: TokenStream [
|
|
Punct {
|
|
ch: '#',
|
|
spacing: Alone,
|
|
span: $DIR/issue-78675-captured-inner-attrs.rs:21:13: 21:14 (#3),
|
|
},
|
|
Group {
|
|
delimiter: Bracket,
|
|
stream: TokenStream [
|
|
Ident {
|
|
ident: "fake_attr",
|
|
span: $DIR/issue-78675-captured-inner-attrs.rs:21:15: 21:24 (#3),
|
|
},
|
|
],
|
|
span: $DIR/issue-78675-captured-inner-attrs.rs:21:14: 21:25 (#3),
|
|
},
|
|
Group {
|
|
delimiter: None,
|
|
stream: TokenStream [
|
|
Ident {
|
|
ident: "mod",
|
|
span: $DIR/issue-78675-captured-inner-attrs.rs:27:5: 27:8 (#0),
|
|
},
|
|
Ident {
|
|
ident: "bar",
|
|
span: $DIR/issue-78675-captured-inner-attrs.rs:27:9: 27:12 (#0),
|
|
},
|
|
Group {
|
|
delimiter: Brace,
|
|
stream: TokenStream [
|
|
Punct {
|
|
ch: '#',
|
|
spacing: Joint,
|
|
span: $DIR/issue-78675-captured-inner-attrs.rs:28:9: 28:16 (#0),
|
|
},
|
|
Punct {
|
|
ch: '!',
|
|
spacing: Alone,
|
|
span: $DIR/issue-78675-captured-inner-attrs.rs:28:9: 28:16 (#0),
|
|
},
|
|
Group {
|
|
delimiter: Bracket,
|
|
stream: TokenStream [
|
|
Ident {
|
|
ident: "doc",
|
|
span: $DIR/issue-78675-captured-inner-attrs.rs:28:9: 28:16 (#0),
|
|
},
|
|
Punct {
|
|
ch: '=',
|
|
spacing: Alone,
|
|
span: $DIR/issue-78675-captured-inner-attrs.rs:28:9: 28:16 (#0),
|
|
},
|
|
Literal {
|
|
kind: StrRaw(0),
|
|
symbol: " Foo",
|
|
suffix: None,
|
|
span: $DIR/issue-78675-captured-inner-attrs.rs:28:9: 28:16 (#0),
|
|
},
|
|
],
|
|
span: $DIR/issue-78675-captured-inner-attrs.rs:28:9: 28:16 (#0),
|
|
},
|
|
],
|
|
span: $DIR/issue-78675-captured-inner-attrs.rs:27:13: 29:6 (#0),
|
|
},
|
|
],
|
|
span: $DIR/issue-78675-captured-inner-attrs.rs:22:13: 22:18 (#3),
|
|
},
|
|
],
|
|
span: $DIR/issue-78675-captured-inner-attrs.rs:20:14: 23:10 (#3),
|
|
},
|
|
]
|