Improve TokenTree variants #18229
Merged
Improve TokenTree variants #18229
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
brendanzab
changed the title
brendanzab
changed the title
brendanzab
changed the title
brendanzab
added
the
A-parser
brendanzab
force-pushed
the
ttdelim
branch
3 times, most recently
from
448b25d to
7580e84
Compare
|
Could you rename Don't you think the new cc #17830. |
|
Ah, this is true... Would boxing the delimiters help? That would take us to 12 words if my calculations are correct... |
|
Very nice. Isn't it 6 words? |
|
Unfortunately with this you lose the nice patten matching... but I guess that is not the biggest issue. |
|
Ok, updated with your suggestion. |
brendanzab
changed the title
|
I've also just made a change to |
This came up when working [on the gl-rs generator extension](https://github.com/bjz/gl-rs/blob/990383de801bd2e233159d5be07c9b5622827620/src/gl_generator/lib.rs#L135-L146). The new definition of `TTDelim` adds an associated `Span` that covers the whole token tree and enforces the invariant that a delimited sequence of token trees must have an opening and closing delimiter. A `get_span` method has also been added to `TokenTree` type to make it easier to implement better error messages for syntax extensions.
This should be clearer, and fits in better with the `TTNonterminal` variant. Renames: - `TTTok` -> `TTToken` - `TTDelim` -> `TTDelimited` - `TTSeq` -> `TTSequence`
|
Rebased |
alexcrichton
added a commit
to alexcrichton/rust
that referenced
this pull request
Oct 27, 2014
lnicola
pushed a commit
to lnicola/rust
that referenced
this pull request
Oct 17, 2024
fix: Join rustfmt overrideCommand with project root When providing a custom rustfmt command, join it with the project root instead of the workspace root. This fixes rust-analyzer getting the wrong invocation path in projects containing subprojects. This makes the behaviour consistent with how a custom path provided in rust-analyzer.procMacro.server behaves already. Resolves issue rust-lang#18222
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I have renamed the
TokenTreevariants to be longer and clearer, and to use standard capitalisation. They should also fit in better with the existingTTNonterminalvariant.The new definition of
TtDelimitedadds an associatedSpanthat covers the whole token tree, and moves the opening and closing delimiters out of the vector of delimited token trees. This came up when working on the gl-rs generator plugin.The
boolinTtSequencehas been replaced with aKleeneOpenum. This should make the intent of the code clearer (I had trouble understanding it).A
get_spanmethod has also been added toTokenTreetype to make it easier to implement better error messages for syntax extensions.[breaking-change]
Renamed:
TTTok->TtTokenTTDelim->TtDelimitedTTSeq->TtSequenceTTNonterminal->TtNonterminalNew definition of
TtDelimited:New definition of
TtSequence: