nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-18 03:25:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
6e5f1dacf3
rust/tests/ui/proc-macro/attribute-after-derive.stdout

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

195 lines
6.4 KiB
Plaintext
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 01:43:44 +00:00
PRINT-ATTR INPUT (DISPLAY): #[derive(Print)] struct AttributeDerive { #[cfg(FALSE)] field: u8, }
PRINT-ATTR DEEP-RE-COLLECTED (DISPLAY): #[derive(Print)] struct AttributeDerive { #[cfg(FALSE)] field : u8, }
expand/resolve: Turn `#[derive]` into a regular macro attribute
2020-11-14 11:47:14 +00:00
PRINT-ATTR INPUT (DEBUG): TokenStream [
Punct {
ch: '#',
spacing: Alone,
Stabilize `feature(macro_attributes_in_derive_output)`
2021-07-17 14:50:33 +00:00
span: $DIR/attribute-after-derive.rs:15:1: 15:2 (#0),
expand/resolve: Turn `#[derive]` into a regular macro attribute
2020-11-14 11:47:14 +00:00
},
Group {
delimiter: Bracket,
stream: TokenStream [
Ident {
ident: "derive",
Stabilize `feature(macro_attributes_in_derive_output)`
2021-07-17 14:50:33 +00:00
span: $DIR/attribute-after-derive.rs:15:3: 15:9 (#0),
expand/resolve: Turn `#[derive]` into a regular macro attribute
2020-11-14 11:47:14 +00:00
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "Print",
Stabilize `feature(macro_attributes_in_derive_output)`
2021-07-17 14:50:33 +00:00
span: $DIR/attribute-after-derive.rs:15:10: 15:15 (#0),
expand/resolve: Turn `#[derive]` into a regular macro attribute
2020-11-14 11:47:14 +00:00
},
],
Stabilize `feature(macro_attributes_in_derive_output)`
2021-07-17 14:50:33 +00:00
span: $DIR/attribute-after-derive.rs:15:9: 15:16 (#0),
expand/resolve: Turn `#[derive]` into a regular macro attribute
2020-11-14 11:47:14 +00:00
},
],
Stabilize `feature(macro_attributes_in_derive_output)`
2021-07-17 14:50:33 +00:00
span: $DIR/attribute-after-derive.rs:15:2: 15:17 (#0),
expand/resolve: Turn `#[derive]` into a regular macro attribute
2020-11-14 11:47:14 +00:00
},
Ident {
ident: "struct",
Stabilize `feature(macro_attributes_in_derive_output)`
2021-07-17 14:50:33 +00:00
span: $DIR/attribute-after-derive.rs:16:1: 16:7 (#0),
expand/resolve: Turn `#[derive]` into a regular macro attribute
2020-11-14 11:47:14 +00:00
},
Ident {
ident: "AttributeDerive",
Stabilize `feature(macro_attributes_in_derive_output)`
2021-07-17 14:50:33 +00:00
span: $DIR/attribute-after-derive.rs:16:8: 16:23 (#0),
expand/resolve: Turn `#[derive]` into a regular macro attribute
2020-11-14 11:47:14 +00:00
},
Group {
delimiter: Brace,
stream: TokenStream [
Punct {
ch: '#',
spacing: Alone,
Stabilize `feature(macro_attributes_in_derive_output)`
2021-07-17 14:50:33 +00:00
span: $DIR/attribute-after-derive.rs:17:5: 17:6 (#0),
expand/resolve: Turn `#[derive]` into a regular macro attribute
2020-11-14 11:47:14 +00:00
},
Group {
delimiter: Bracket,
stream: TokenStream [
Ident {
ident: "cfg",
Stabilize `feature(macro_attributes_in_derive_output)`
2021-07-17 14:50:33 +00:00
span: $DIR/attribute-after-derive.rs:17:7: 17:10 (#0),
expand/resolve: Turn `#[derive]` into a regular macro attribute
2020-11-14 11:47:14 +00:00
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "FALSE",
Stabilize `feature(macro_attributes_in_derive_output)`
2021-07-17 14:50:33 +00:00
span: $DIR/attribute-after-derive.rs:17:11: 17:16 (#0),
expand/resolve: Turn `#[derive]` into a regular macro attribute
2020-11-14 11:47:14 +00:00
},
],
Stabilize `feature(macro_attributes_in_derive_output)`
2021-07-17 14:50:33 +00:00
span: $DIR/attribute-after-derive.rs:17:10: 17:17 (#0),
expand/resolve: Turn `#[derive]` into a regular macro attribute
2020-11-14 11:47:14 +00:00
},
],
Stabilize `feature(macro_attributes_in_derive_output)`
2021-07-17 14:50:33 +00:00
span: $DIR/attribute-after-derive.rs:17:6: 17:18 (#0),
expand/resolve: Turn `#[derive]` into a regular macro attribute
2020-11-14 11:47:14 +00:00
},
Ident {
ident: "field",
Stabilize `feature(macro_attributes_in_derive_output)`
2021-07-17 14:50:33 +00:00
span: $DIR/attribute-after-derive.rs:18:5: 18:10 (#0),
expand/resolve: Turn `#[derive]` into a regular macro attribute
2020-11-14 11:47:14 +00:00
},
Punct {
ch: ':',
spacing: Alone,
Stabilize `feature(macro_attributes_in_derive_output)`
2021-07-17 14:50:33 +00:00
span: $DIR/attribute-after-derive.rs:18:10: 18:11 (#0),
expand/resolve: Turn `#[derive]` into a regular macro attribute
2020-11-14 11:47:14 +00:00
},
Ident {
ident: "u8",
Stabilize `feature(macro_attributes_in_derive_output)`
2021-07-17 14:50:33 +00:00
span: $DIR/attribute-after-derive.rs:18:12: 18:14 (#0),
expand/resolve: Turn `#[derive]` into a regular macro attribute
2020-11-14 11:47:14 +00:00
},
Punct {
ch: ',',
spacing: Alone,
Stabilize `feature(macro_attributes_in_derive_output)`
2021-07-17 14:50:33 +00:00
span: $DIR/attribute-after-derive.rs:18:14: 18:15 (#0),
expand/resolve: Turn `#[derive]` into a regular macro attribute
2020-11-14 11:47:14 +00:00
},
],
Stabilize `feature(macro_attributes_in_derive_output)`
2021-07-17 14:50:33 +00:00
span: $DIR/attribute-after-derive.rs:16:24: 19:2 (#0),
expand/resolve: Turn `#[derive]` into a regular macro attribute
2020-11-14 11:47:14 +00:00
},
]
Pretty print empty blocks as {}
2021-12-01 19:45:14 +00:00
PRINT-DERIVE INPUT (DISPLAY): struct AttributeDerive {}
expand/resolve: Turn `#[derive]` into a regular macro attribute
2020-11-14 11:47:14 +00:00
PRINT-DERIVE INPUT (DEBUG): TokenStream [
Ident {
ident: "struct",
Stabilize `feature(macro_attributes_in_derive_output)`
2021-07-17 14:50:33 +00:00
span: $DIR/attribute-after-derive.rs:16:1: 16:7 (#0),
expand/resolve: Turn `#[derive]` into a regular macro attribute
2020-11-14 11:47:14 +00:00
},
Ident {
ident: "AttributeDerive",
Stabilize `feature(macro_attributes_in_derive_output)`
2021-07-17 14:50:33 +00:00
span: $DIR/attribute-after-derive.rs:16:8: 16:23 (#0),
expand/resolve: Turn `#[derive]` into a regular macro attribute
2020-11-14 11:47:14 +00:00
},
Group {
delimiter: Brace,
stream: TokenStream [],
Stabilize `feature(macro_attributes_in_derive_output)`
2021-07-17 14:50:33 +00:00
span: $DIR/attribute-after-derive.rs:16:24: 19:2 (#0),
expand/resolve: Turn `#[derive]` into a regular macro attribute
2020-11-14 11:47:14 +00:00
},
]
Pretty print empty blocks as {}
2021-12-01 19:45:14 +00:00
PRINT-DERIVE INPUT (DISPLAY): #[print_attr] struct DeriveAttribute {}
expand/resolve: Turn `#[derive]` into a regular macro attribute
2020-11-14 11:47:14 +00:00
PRINT-DERIVE INPUT (DEBUG): TokenStream [
Punct {
ch: '#',
spacing: Alone,
Stabilize `feature(macro_attributes_in_derive_output)`
2021-07-17 14:50:33 +00:00
span: $DIR/attribute-after-derive.rs:22:1: 22:2 (#0),
expand/resolve: Turn `#[derive]` into a regular macro attribute
2020-11-14 11:47:14 +00:00
},
Group {
delimiter: Bracket,
stream: TokenStream [
Ident {
ident: "print_attr",
Stabilize `feature(macro_attributes_in_derive_output)`
2021-07-17 14:50:33 +00:00
span: $DIR/attribute-after-derive.rs:22:3: 22:13 (#0),
expand/resolve: Turn `#[derive]` into a regular macro attribute
2020-11-14 11:47:14 +00:00
},
],
Stabilize `feature(macro_attributes_in_derive_output)`
2021-07-17 14:50:33 +00:00
span: $DIR/attribute-after-derive.rs:22:2: 22:14 (#0),
expand/resolve: Turn `#[derive]` into a regular macro attribute
2020-11-14 11:47:14 +00:00
},
Ident {
ident: "struct",
Stabilize `feature(macro_attributes_in_derive_output)`
2021-07-17 14:50:33 +00:00
span: $DIR/attribute-after-derive.rs:23:1: 23:7 (#0),
expand/resolve: Turn `#[derive]` into a regular macro attribute
2020-11-14 11:47:14 +00:00
},
Ident {
ident: "DeriveAttribute",
Stabilize `feature(macro_attributes_in_derive_output)`
2021-07-17 14:50:33 +00:00
span: $DIR/attribute-after-derive.rs:23:8: 23:23 (#0),
expand/resolve: Turn `#[derive]` into a regular macro attribute
2020-11-14 11:47:14 +00:00
},
Group {
delimiter: Brace,
stream: TokenStream [],
Stabilize `feature(macro_attributes_in_derive_output)`
2021-07-17 14:50:33 +00:00
span: $DIR/attribute-after-derive.rs:23:24: 26:2 (#0),
expand/resolve: Turn `#[derive]` into a regular macro attribute
2020-11-14 11:47:14 +00:00
},
]
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 01:43:44 +00:00
PRINT-ATTR INPUT (DISPLAY): struct DeriveAttribute { #[cfg(FALSE)] field: u8, }
PRINT-ATTR DEEP-RE-COLLECTED (DISPLAY): struct DeriveAttribute { #[cfg(FALSE)] field : u8, }
Expand derive invocations in left-to-right order While derives were being collected in left-to-order order, the corresponding `Invocation`s were being pushed in the wrong order.
2021-04-09 01:35:24 +00:00
PRINT-ATTR INPUT (DEBUG): TokenStream [
Ident {
ident: "struct",
Stabilize `feature(macro_attributes_in_derive_output)`
2021-07-17 14:50:33 +00:00
span: $DIR/attribute-after-derive.rs:23:1: 23:7 (#0),
Expand derive invocations in left-to-right order While derives were being collected in left-to-order order, the corresponding `Invocation`s were being pushed in the wrong order.
2021-04-09 01:35:24 +00:00
},
Ident {
ident: "DeriveAttribute",
Stabilize `feature(macro_attributes_in_derive_output)`
2021-07-17 14:50:33 +00:00
span: $DIR/attribute-after-derive.rs:23:8: 23:23 (#0),
Expand derive invocations in left-to-right order While derives were being collected in left-to-order order, the corresponding `Invocation`s were being pushed in the wrong order.
2021-04-09 01:35:24 +00:00
},
Group {
delimiter: Brace,
builtin_macros: Make #[derive(A, B, ...)] cfg-eval its input only for `A, B, ...`
2021-07-17 14:10:03 +00:00
stream: TokenStream [
Punct {
ch: '#',
spacing: Alone,
Stabilize `feature(macro_attributes_in_derive_output)`
2021-07-17 14:50:33 +00:00
span: $DIR/attribute-after-derive.rs:24:5: 24:6 (#0),
builtin_macros: Make #[derive(A, B, ...)] cfg-eval its input only for `A, B, ...`
2021-07-17 14:10:03 +00:00
},
Group {
delimiter: Bracket,
stream: TokenStream [
Ident {
ident: "cfg",
Stabilize `feature(macro_attributes_in_derive_output)`
2021-07-17 14:50:33 +00:00
span: $DIR/attribute-after-derive.rs:24:7: 24:10 (#0),
builtin_macros: Make #[derive(A, B, ...)] cfg-eval its input only for `A, B, ...`
2021-07-17 14:10:03 +00:00
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "FALSE",
Stabilize `feature(macro_attributes_in_derive_output)`
2021-07-17 14:50:33 +00:00
span: $DIR/attribute-after-derive.rs:24:11: 24:16 (#0),
builtin_macros: Make #[derive(A, B, ...)] cfg-eval its input only for `A, B, ...`
2021-07-17 14:10:03 +00:00
},
],
Stabilize `feature(macro_attributes_in_derive_output)`
2021-07-17 14:50:33 +00:00
span: $DIR/attribute-after-derive.rs:24:10: 24:17 (#0),
builtin_macros: Make #[derive(A, B, ...)] cfg-eval its input only for `A, B, ...`
2021-07-17 14:10:03 +00:00
},
],
Stabilize `feature(macro_attributes_in_derive_output)`
2021-07-17 14:50:33 +00:00
span: $DIR/attribute-after-derive.rs:24:6: 24:18 (#0),
builtin_macros: Make #[derive(A, B, ...)] cfg-eval its input only for `A, B, ...`
2021-07-17 14:10:03 +00:00
},
Ident {
ident: "field",
Stabilize `feature(macro_attributes_in_derive_output)`
2021-07-17 14:50:33 +00:00
span: $DIR/attribute-after-derive.rs:25:5: 25:10 (#0),
builtin_macros: Make #[derive(A, B, ...)] cfg-eval its input only for `A, B, ...`
2021-07-17 14:10:03 +00:00
},
Punct {
ch: ':',
spacing: Alone,
Stabilize `feature(macro_attributes_in_derive_output)`
2021-07-17 14:50:33 +00:00
span: $DIR/attribute-after-derive.rs:25:10: 25:11 (#0),
builtin_macros: Make #[derive(A, B, ...)] cfg-eval its input only for `A, B, ...`
2021-07-17 14:10:03 +00:00
},
Ident {
ident: "u8",
Stabilize `feature(macro_attributes_in_derive_output)`
2021-07-17 14:50:33 +00:00
span: $DIR/attribute-after-derive.rs:25:12: 25:14 (#0),
builtin_macros: Make #[derive(A, B, ...)] cfg-eval its input only for `A, B, ...`
2021-07-17 14:10:03 +00:00
},
Punct {
ch: ',',
spacing: Alone,
Stabilize `feature(macro_attributes_in_derive_output)`
2021-07-17 14:50:33 +00:00
span: $DIR/attribute-after-derive.rs:25:14: 25:15 (#0),
builtin_macros: Make #[derive(A, B, ...)] cfg-eval its input only for `A, B, ...`
2021-07-17 14:10:03 +00:00
},
],
Stabilize `feature(macro_attributes_in_derive_output)`
2021-07-17 14:50:33 +00:00
span: $DIR/attribute-after-derive.rs:23:24: 26:2 (#0),
Expand derive invocations in left-to-right order While derives were being collected in left-to-order order, the corresponding `Invocation`s were being pushed in the wrong order.
2021-04-09 01:35:24 +00:00
},
]
Reference in New Issue Copy Permalink