Keyword tweaks #138385
Merged
Keyword tweaks #138385
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
|
Some changes occurred in src/tools/rustfmt cc @rust-lang/rustfmt |
|
Best reviewed one commit at a time. |
|
☔ The latest upstream changes (presumably #138388) made this pull request unmergeable. Please resolve the merge conflicts. |
0041a4c to
1686129
Compare
They're dodgy, covering all the keywords, including weak ones, and edition-specific ones without considering the edition. They have a single use in rustfmt. This commit changes that use to `is_reserved_ident`, which is a much more widely used alternative and is good enough, judging by the lack of effect on the test suite.
So the order of the `Symbol::is_*` predicates match the order of the keywords list.
1686129 to
a29e875
Compare
Noratrieb
reviewed
Mar 24, 2025
|
@bors r+ rollup |
TaKO8Ki
added a commit
to TaKO8Ki/rust
that referenced
this pull request
Mar 24, 2025
…trieb Keyword tweaks r? `@Noratrieb`
TaKO8Ki
added a commit
to TaKO8Ki/rust
that referenced
this pull request
Mar 24, 2025
…trieb Keyword tweaks r? ``@Noratrieb``
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 25, 2025
Rollup of 10 pull requests Successful merges: - rust-lang#138385 (Keyword tweaks) - rust-lang#138580 (resolve: Avoid some unstable iteration 2) - rust-lang#138652 (Reintroduce remote-test support in run-make tests) - rust-lang#138701 (Make default_codegen_backend serializable) - rust-lang#138755 ([rustdoc] Remove duplicated loop when computing doc cfgs) - rust-lang#138829 (Slightly reword triagebot ping message for `relnotes-interest-group`) - rust-lang#138837 (resolve: Avoid remaining unstable iteration) - rust-lang#138838 (Fix/tweak some tests in new solver) - rust-lang#138877 (Ignore doctests only in specified targets) - rust-lang#138895 (Add a helper for building an owner id in ast lowering) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 25, 2025
Rollup of 10 pull requests Successful merges: - rust-lang#138385 (Keyword tweaks) - rust-lang#138580 (resolve: Avoid some unstable iteration 2) - rust-lang#138652 (Reintroduce remote-test support in run-make tests) - rust-lang#138701 (Make default_codegen_backend serializable) - rust-lang#138755 ([rustdoc] Remove duplicated loop when computing doc cfgs) - rust-lang#138829 (Slightly reword triagebot ping message for `relnotes-interest-group`) - rust-lang#138837 (resolve: Avoid remaining unstable iteration) - rust-lang#138838 (Fix/tweak some tests in new solver) - rust-lang#138877 (Ignore doctests only in specified targets) - rust-lang#138895 (Add a helper for building an owner id in ast lowering) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 25, 2025
Rollup of 9 pull requests Successful merges: - rust-lang#138385 (Keyword tweaks) - rust-lang#138580 (resolve: Avoid some unstable iteration 2) - rust-lang#138652 (Reintroduce remote-test support in run-make tests) - rust-lang#138701 (Make default_codegen_backend serializable) - rust-lang#138755 ([rustdoc] Remove duplicated loop when computing doc cfgs) - rust-lang#138829 (Slightly reword triagebot ping message for `relnotes-interest-group`) - rust-lang#138837 (resolve: Avoid remaining unstable iteration) - rust-lang#138838 (Fix/tweak some tests in new solver) - rust-lang#138895 (Add a helper for building an owner id in ast lowering) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 25, 2025
Rollup of 9 pull requests Successful merges: - rust-lang#138385 (Keyword tweaks) - rust-lang#138580 (resolve: Avoid some unstable iteration 2) - rust-lang#138652 (Reintroduce remote-test support in run-make tests) - rust-lang#138701 (Make default_codegen_backend serializable) - rust-lang#138755 ([rustdoc] Remove duplicated loop when computing doc cfgs) - rust-lang#138829 (Slightly reword triagebot ping message for `relnotes-interest-group`) - rust-lang#138837 (resolve: Avoid remaining unstable iteration) - rust-lang#138838 (Fix/tweak some tests in new solver) - rust-lang#138895 (Add a helper for building an owner id in ast lowering) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 25, 2025
Rollup merge of rust-lang#138385 - nnethercote:keyword-tweaks, r=Noratrieb Keyword tweaks r? ```@Noratrieb```
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.
r? @Noratrieb