Skip to content

Commit cae5eb3

Browse files
committed
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.
1 parent bd9be87 commit cae5eb3

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

proc_macro/src/lib.rs

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -925,25 +925,23 @@ impl !Sync for Punct {}
925925
pub enum Spacing {
926926
/// A `Punct` token can join with the following token to form a multi-character operator.
927927
///
928-
/// In token streams constructed using proc macro interfaces `Joint` punctuation tokens can be
929-
/// followed by any other tokens. \
930-
/// However, in token streams parsed from source code compiler will only set spacing to `Joint`
931-
/// in the following cases:
932-
/// - A `Punct` is immediately followed by another `Punct` without a whitespace. \
933-
/// E.g. `+` is `Joint` in `+=` and `++`.
934-
/// - A single quote `'` is immediately followed by an identifier without a whitespace. \
928+
/// In token streams constructed using proc macro interfaces, `Joint` punctuation tokens can be
929+
/// followed by any other tokens. However, in token streams parsed from source code, the
930+
/// compiler will only set spacing to `Joint` in the following cases.
931+
/// - When a `Punct` is immediately followed by another `Punct` without a whitespace. E.g. `+`
932+
/// is `Joint` in `+=` and `++`.
933+
/// - When a single quote `'` is immediately followed by an identifier without a whitespace.
935934
/// E.g. `'` is `Joint` in `'lifetime`.
936935
///
937936
/// This list may be extended in the future to enable more token combinations.
938937
#[stable(feature = "proc_macro_lib2", since = "1.29.0")]
939938
Joint,
940939
/// A `Punct` token cannot join with the following token to form a multi-character operator.
941940
///
942-
/// `Alone` punctuation tokens can be followed by any other tokens. \
943-
/// In token streams parsed from source code compiler will set spacing to `Alone` in all cases
944-
/// not covered by the conditions for `Joint` above. \
945-
/// E.g. `+` is `Alone` in `+ =`, `+ident` and `+()`.
946-
/// In particular, token not followed by anything will also be marked as `Alone`.
941+
/// `Alone` punctuation tokens can be followed by any other tokens. In token streams parsed
942+
/// from source code, the compiler will set spacing to `Alone` in all cases not covered by the
943+
/// conditions for `Joint` above. E.g. `+` is `Alone` in `+ =`, `+ident` and `+()`. In
944+
/// particular, tokens not followed by anything will be marked as `Alone`.
947945
#[stable(feature = "proc_macro_lib2", since = "1.29.0")]
948946
Alone,
949947
}
@@ -978,8 +976,8 @@ impl Punct {
978976
}
979977

980978
/// Returns the spacing of this punctuation character, indicating whether it can be potentially
981-
/// combined into a multi-character operator with the following token (`Joint`), or the operator
982-
/// has certainly ended (`Alone`).
979+
/// combined into a multi-character operator with the following token (`Joint`), or whether the
980+
/// operator has definitely ended (`Alone`).
983981
#[stable(feature = "proc_macro_lib2", since = "1.29.0")]
984982
pub fn spacing(&self) -> Spacing {
985983
if self.0.joint { Spacing::Joint } else { Spacing::Alone }

0 commit comments

Comments
 (0)