Interpolated cleanups #122752
Merged
Interpolated cleanups #122752
Conversation
This file contains 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
rustbot
added
S-waiting-on-review
petrochenkov
added
S-waiting-on-author
This comment was marked as resolved.
This comment was marked as resolved.
This makes it consistent with `is_whole_expr` and `is_whole_block`.
It can't use `maybe_whole`, but it can match `maybe_whole` more closely. Also add a test for a case that wasn't previously covered.
This requires changing `maybe_whole!` so it allows the value to be modified.
It has no effect on anything in the test suite.
This commit combines `MatchedTokenTree` and `MatchedNonterminal`, which are often considered together, into a single `MatchedSingle`. It shares a representation with the newly-parameterized `ParseNtResult`. This will also make things much simpler if/when variants from `Interpolated` start being moved to `ParseNtResult`.
It uses very old language that is more confusing today than helpful, including references to `SubstNt` that no longer exists. The comment above `TokenStream` is better, and suffices for a basic understanding of these types.
nnethercote
force-pushed
the
Interpolated-cleanups
branch
from
c23155c to
82a609f
Compare
|
New code is up:
|
|
@bors r+ |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 21, 2024
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#122402 (Make `#[diagnostic::on_unimplemented]` format string parsing more robust) - rust-lang#122644 (pattern analysis: add a custom test harness) - rust-lang#122733 (Strip placeholders from hidden types before remapping generic parameter) - rust-lang#122752 (Interpolated cleanups) - rust-lang#122771 (add some comments to hir::ModuleItems) - rust-lang#122793 (Implement macro-based deref!() syntax for deref patterns) - rust-lang#122810 (Remove `target_override`) - rust-lang#122827 (Remove unnecessary braces from `bug`/`span_bug`) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 21, 2024
Rollup merge of rust-lang#122752 - nnethercote:Interpolated-cleanups, r=petrochenkov Interpolated cleanups Various cleanups I made while working on attempts to remove `Interpolated`, that are worth merging now. Best reviewed one commit at a time. r? `@petrochenkov`
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
Various cleanups I made while working on attempts to remove
Interpolated, that are worth merging now. Best reviewed one commit at a time.r? @petrochenkov