rustc_expand cleanups
#124607
Merged
rustc_expand cleanups
#124607
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
|
Looks good to me, thanks for the PR, @nnethercote! @bors r+ rollup |
bors
added
S-waiting-on-bors
|
☔ The latest upstream changes (presumably #124521) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
This was referenced May 2, 2024
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 2, 2024
…iaskrgr Rollup of 4 pull requests Successful merges: - rust-lang#124345 (Enable `--check-cfg` by default in UI tests) - rust-lang#124412 (io safety: update Unix explanation to use `Arc`) - rust-lang#124441 (String.truncate comment microfix (greater or equal)) - rust-lang#124604 (library/std: Remove unused `gimli-symbolize` feature) Failed merges: - rust-lang#124607 (`rustc_expand` cleanups) - rust-lang#124613 (Allow fmt to run on rmake.rs test files) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 2, 2024
…iaskrgr Rollup of 4 pull requests Successful merges: - rust-lang#124345 (Enable `--check-cfg` by default in UI tests) - rust-lang#124412 (io safety: update Unix explanation to use `Arc`) - rust-lang#124441 (String.truncate comment microfix (greater or equal)) - rust-lang#124604 (library/std: Remove unused `gimli-symbolize` feature) Failed merges: - rust-lang#124607 (`rustc_expand` cleanups) - rust-lang#124613 (Allow fmt to run on rmake.rs test files) r? `@ghost` `@rustbot` modify labels: rollup
Sort them, and remove the unused ones (`lint_reasons` and `proc_macro_span`).
They each have a single call site.
Control flow never gets past the end of the `ExpandResult::Retry` match arm, due to the `span_bug` and the `continue`. Therefore, the code after the match can only be reached from the `ExpandResult::Ready` arm. This commit moves that code after the match into the `ExpandResult::Ready` arm, avoiding the need for the `continue` in the `ExpandResult::Retry` arm.
Too clever by half, IMO.
Alongside the existing `Invocation::span`.
Because the type is not obvious, and this clarifies things.
It is currently an enum and the `tts` and `idx` fields are repeated across the two variants. This commit splits it into a struct `Frame` and an enum `FrameKind`, to factor out the duplication. The commit also renames `Frame::new` as `Frame::new_delimited` and adds `Frame::new_sequence`. I.e. both variants now have a constructor.
nnethercote
force-pushed
the
rustc_expand-cleanups
branch
from
40f54bd
to
3a3a15d
Compare
|
I rebased. @bors r=compiler-errors |
bors
added
S-waiting-on-bors
fmease
added a commit
to fmease/rust
that referenced
this pull request
May 3, 2024
… r=compiler-errors `rustc_expand` cleanups Some cleanups I made while looking through this code. Nothing that requires any real domain-specific knowledge about this crate. r? `@michaelwoerister`
fmease
added a commit
to fmease/rust
that referenced
this pull request
May 3, 2024
… r=compiler-errors `rustc_expand` cleanups Some cleanups I made while looking through this code. Nothing that requires any real domain-specific knowledge about this crate. r? ``@michaelwoerister``
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 3, 2024
Rollup of 8 pull requests Successful merges: - rust-lang#124412 (io safety: update Unix explanation to use `Arc`) - rust-lang#124441 (String.truncate comment microfix (greater or equal)) - rust-lang#124594 (run-make-support: preserve tooks.mk behavior for EXTRACXXFLAGS) - rust-lang#124604 (library/std: Remove unused `gimli-symbolize` feature) - rust-lang#124607 (`rustc_expand` cleanups) - rust-lang#124609 (variable-precision float operations can differ depending on optimization levels) - rust-lang#124610 (Tweak `consts_may_unify`) - rust-lang#124612 (Add support for inputing via stdin with run-make-support) r? `@ghost` `@rustbot` modify labels: rollup
fmease
added a commit
to fmease/rust
that referenced
this pull request
May 3, 2024
… r=compiler-errors `rustc_expand` cleanups Some cleanups I made while looking through this code. Nothing that requires any real domain-specific knowledge about this crate. r? ```@michaelwoerister```
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 3, 2024
Rollup of 7 pull requests Successful merges: - rust-lang#124441 (String.truncate comment microfix (greater or equal)) - rust-lang#124594 (run-make-support: preserve tooks.mk behavior for EXTRACXXFLAGS) - rust-lang#124604 (library/std: Remove unused `gimli-symbolize` feature) - rust-lang#124607 (`rustc_expand` cleanups) - rust-lang#124609 (variable-precision float operations can differ depending on optimization levels) - rust-lang#124610 (Tweak `consts_may_unify`) - rust-lang#124637 (AST pretty: Use `builtin_syntax` for type ascription) Failed merges: - rust-lang#124638 (Move some tests from `rustc_expand` to `rustc_parse`.) r? `@ghost` `@rustbot` modify labels: rollup
Wrong Michael 😉 @bors r=michaelwoerister |
|
💡 This pull request was already approved, no need to approve it again.
|
Whoops, sorry! |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 3, 2024
…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#123480 (deref patterns: impl `DerefPure` for more std types) - rust-lang#124412 (io safety: update Unix explanation to use `Arc`) - rust-lang#124441 (String.truncate comment microfix (greater or equal)) - rust-lang#124594 (run-make-support: preserve tooks.mk behavior for EXTRACXXFLAGS) - rust-lang#124604 (library/std: Remove unused `gimli-symbolize` feature) - rust-lang#124607 (`rustc_expand` cleanups) - rust-lang#124609 (variable-precision float operations can differ depending on optimization levels) - rust-lang#124610 (Tweak `consts_may_unify`) - rust-lang#124626 (const_eval_select: add tracking issue) - rust-lang#124637 (AST pretty: Use `builtin_syntax` for type ascription) Failed merges: - rust-lang#124638 (Move some tests from `rustc_expand` to `rustc_parse`.) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 3, 2024
Rollup merge of rust-lang#124607 - nnethercote:rustc_expand-cleanups, r=compiler-errors `rustc_expand` cleanups Some cleanups I made while looking through this code. Nothing that requires any real domain-specific knowledge about this crate. r? ````@michaelwoerister````
|
@bors r- |
bors
added
S-waiting-on-author
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.
Some cleanups I made while looking through this code. Nothing that requires any real domain-specific knowledge about this crate.
r? @michaelwoerister