force_collect improvements
#127903
Merged
force_collect improvements
#127903
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
|
@bors r+ |
|
@bors rollup |
|
☔ The latest upstream changes (presumably #127906) made this pull request unmergeable. Please resolve the merge conflicts. |
No need to collect tokens on this recovery path, because the parsed statement isn't even looked at.
Use a parameter to decide whether to force collect, as is done for the closely related `parse_local_mk` method.
Instead of a `bool`. Because `ForceCollect` is used in this way everywhere else.
There are three places where we currently check `force_collect` and call `collect_tokens_no_attrs` for `ForceCollect::Yes` and a vanilla parsing function for `ForceCollect::No`. But we can instead just pass in `force_collect` and let `collect_tokens_trailing_token` do the appropriate thing.
1ae1879
to
4158a1c
Compare
|
I rebased. @bors r=petrochenkov |
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jul 19, 2024
…ents, r=petrochenkov `force_collect` improvements Yet more cleanups relating to `cfg_attr` processing. r? ``@petrochenkov``
tgross35
added a commit
to tgross35/rust
that referenced
this pull request
Jul 19, 2024
…ents, r=petrochenkov `force_collect` improvements Yet more cleanups relating to `cfg_attr` processing. r? ```@petrochenkov```
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 19, 2024
Rollup of 7 pull requests Successful merges: - rust-lang#123196 (Add Process support for UEFI) - rust-lang#127350 (Parser: Suggest Placing the Return Type After Function Parameters) - rust-lang#127523 (Migrate `dump-ice-to-disk` and `panic-abort-eh_frame` `run-make` tests to rmake) - rust-lang#127662 (When finding item gated behind a `cfg` flag, point at it) - rust-lang#127903 (`force_collect` improvements) - rust-lang#127932 (rustdoc: fix `current` class on sidebar modnav) - rust-lang#127943 (Don't allow unsafe statics outside of extern blocks) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 19, 2024
…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#127350 (Parser: Suggest Placing the Return Type After Function Parameters) - rust-lang#127621 (Rewrite and rename `issue-22131` and `issue-26006` `run-make` tests to rmake) - rust-lang#127662 (When finding item gated behind a `cfg` flag, point at it) - rust-lang#127903 (`force_collect` improvements) - rust-lang#127932 (rustdoc: fix `current` class on sidebar modnav) - rust-lang#127943 (Don't allow unsafe statics outside of extern blocks) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 19, 2024
Rollup merge of rust-lang#127903 - nnethercote:force_collect-improvements, r=petrochenkov `force_collect` improvements Yet more cleanups relating to `cfg_attr` processing. r? ````@petrochenkov````
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.
Yet more cleanups relating to
cfg_attrprocessing.r? @petrochenkov