mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
os-rust/tests/ui/proc-macro/pretty-print-tts.stdout

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

104 lines
3.5 KiB
Text
Raw Normal View History

Improve `print_tts` by changing `tokenstream::Spacing`. `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.
2023-08-08 11:43:44 +10:00
PRINT-BANG INPUT (DISPLAY): { #![rustc_dummy] let a = "hello".len() ; matches!(a, 5) ; }
PRINT-BANG DEEP-RE-COLLECTED (DISPLAY): { #! [rustc_dummy] let a = "hello".len() ; matches! (a, 5) ; }
Remove some unncessary spaces from pretty-printed tokenstream output In addition to making the output look nicer for all crates, this also aligns the pretty-printing output with what the `rental` crate expects. This will allow us to eventually disable a backwards-compat hack in a follow-up PR.
2021-05-01 15:54:47 -04:00
PRINT-BANG INPUT (DEBUG): TokenStream [
Group {
delimiter: Brace,
stream: TokenStream [
Punct {
ch: '#',
spacing: Joint,
span: $DIR/pretty-print-tts.rs:15:5: 15:6 (#0),
},
Punct {
ch: '!',
spacing: Alone,
span: $DIR/pretty-print-tts.rs:15:6: 15:7 (#0),
},
Group {
delimiter: Bracket,
stream: TokenStream [
Ident {
ident: "rustc_dummy",
span: $DIR/pretty-print-tts.rs:15:8: 15:19 (#0),
},
],
span: $DIR/pretty-print-tts.rs:15:7: 15:20 (#0),
},
Ident {
ident: "let",
span: $DIR/pretty-print-tts.rs:16:5: 16:8 (#0),
},
Ident {
ident: "a",
span: $DIR/pretty-print-tts.rs:16:9: 16:10 (#0),
},
Punct {
ch: '=',
spacing: Alone,
span: $DIR/pretty-print-tts.rs:16:11: 16:12 (#0),
},
Literal {
kind: Str,
symbol: "hello",
suffix: None,
span: $DIR/pretty-print-tts.rs:16:13: 16:20 (#0),
},
Punct {
ch: '.',
spacing: Alone,
span: $DIR/pretty-print-tts.rs:16:20: 16:21 (#0),
},
Ident {
ident: "len",
span: $DIR/pretty-print-tts.rs:16:21: 16:24 (#0),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [],
span: $DIR/pretty-print-tts.rs:16:24: 16:26 (#0),
},
Punct {
ch: ';',
spacing: Alone,
span: $DIR/pretty-print-tts.rs:16:26: 16:27 (#0),
},
Ident {
ident: "matches",
span: $DIR/pretty-print-tts.rs:17:5: 17:12 (#0),
},
Punct {
ch: '!',
spacing: Alone,
span: $DIR/pretty-print-tts.rs:17:12: 17:13 (#0),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "a",
span: $DIR/pretty-print-tts.rs:17:14: 17:15 (#0),
},
Punct {
ch: ',',
spacing: Alone,
span: $DIR/pretty-print-tts.rs:17:15: 17:16 (#0),
},
Literal {
kind: Integer,
symbol: "5",
suffix: None,
span: $DIR/pretty-print-tts.rs:17:17: 17:18 (#0),
},
],
span: $DIR/pretty-print-tts.rs:17:13: 17:19 (#0),
},
Punct {
ch: ';',
spacing: Alone,
span: $DIR/pretty-print-tts.rs:17:19: 17:20 (#0),
},
],
span: $DIR/pretty-print-tts.rs:14:21: 18:2 (#0),
},
]
Reference in a new issue Copy permalink