Fix const items not being allowed to be called `r#move` or `r#static` #137140

Noratrieb · 2025-02-16T15:26:44Z

Because of an ambiguity with const closures, the parser needs to ensure that for a const item, the const keyword isn't followed by a move or static keyword, as that would indicate a const closure:

fn main() {
  const move // ...
}

This check did not take raw identifiers into account, therefore being unable to distinguish between const move and const r#move. The latter is obviously not a const closure, so it should be allowed as a const item.

This fixes the check in the parser to only treat const ... as a const closure if it's followed by the proper keyword, and not a raw identifier.

Additionally, this adds a large test that tests for all raw identifiers in all kinds of positions, including const, to prevent issues like this one from occurring again.

fixes #137128

rustbot · 2025-02-16T15:26:52Z

r? @jieyouxu

rustbot has assigned @jieyouxu.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

Noratrieb · 2025-02-16T15:29:22Z

I don't really know if this is something that should get a lang FCP or not... This is definitely a bug and an (older) regression, so I'm inclined to say no. I don't think a lang FCP would be useful, as it's obvious that this should be allowed. But I'll @rust-lang/lang for visibility.

jieyouxu

The parser change looks good to me, I have a nit about the test.

tests/ui/parser/raw/raw-idents.rs

Noratrieb · 2025-02-16T16:59:14Z

I'm going to un-nominate this, because I don't think this is worth T-lang's very limited bandwidth. If anyone has objections, you can send them here, but I cannot imagine what an objection would look like :D.

compiler-errors

Yeah, this definitely does not need lang discussion because it's just a parser bug.

Noratrieb · 2025-02-16T17:09:59Z

@theemathas pointed out that i wrote this test in a quite silly way, so I fixed that. And I added revisions.

tests/ui/parser/raw/raw-idents.rs

Because of an ambiguity with const closures, the parser needs to ensure that for a const item, the `const` keyword isn't followed by a `move` or `static` keyword, as that would indicate a const closure: ```rust fn main() { const move // ... } ``` This check did not take raw identifiers into account, therefore being unable to distinguish between `const move` and `const r#move`. The latter is obviously not a const closure, so it should be allowed as a const item. This fixes the check in the parser to only treat `const ...` as a const closure if it's followed by the *proper keyword*, and not a raw identifier. Additionally, this adds a large test that tests for all raw identifiers in all kinds of positions, including `const`, to prevent issues like this one from occurring again.

jieyouxu

Thanks, also r=me once PR CI is green.

Noratrieb · 2025-02-16T17:27:16Z

looks green to me

@bors r=jieyouxu,compiler-errors

bors · 2025-02-16T17:27:18Z

📌 Commit 8a02724 has been approved by jieyouxu,compiler-errors

It is now in the queue for this repository.

…ompiler-errors Fix const items not being allowed to be called `r#move` or `r#static` Because of an ambiguity with const closures, the parser needs to ensure that for a const item, the `const` keyword isn't followed by a `move` or `static` keyword, as that would indicate a const closure: ```rust fn main() { const move // ... } ``` This check did not take raw identifiers into account, therefore being unable to distinguish between `const move` and `const r#move`. The latter is obviously not a const closure, so it should be allowed as a const item. This fixes the check in the parser to only treat `const ...` as a const closure if it's followed by the *proper keyword*, and not a raw identifier. Additionally, this adds a large test that tests for all raw identifiers in all kinds of positions, including `const`, to prevent issues like this one from occurring again. fixes rust-lang#137128

…kingjubilee Rollup of 12 pull requests Successful merges: - rust-lang#136671 (Overhaul `rustc_middle::limits`) - rust-lang#136817 (Pattern Migration 2024: clean up and comment) - rust-lang#136844 (Use `const_error!` when possible) - rust-lang#136953 (rustc_target: import TargetMetadata) - rust-lang#137095 (Replace some u64 hashes with Hash64) - rust-lang#137100 (HIR analysis: Remove unnecessary abstraction over list of clauses) - rust-lang#137105 (Restrict DerefPure for Cow<T> impl to T = impl Clone, [impl Clone], str.) - rust-lang#137120 (Enable `relative-path-include-bytes-132203` rustdoc-ui test on Windows) - rust-lang#137125 (Re-add missing empty lines in the releases notes) - rust-lang#137140 (Fix const items not being allowed to be called `r#move` or `r#static`) - rust-lang#137145 (use add-core-stubs / minicore for a few more tests) - rust-lang#137149 (Remove SSE ABI from i586-pc-windows-msvc) r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#136466 (Start removing `rustc_middle::hir::map::Map`) - rust-lang#136671 (Overhaul `rustc_middle::limits`) - rust-lang#136817 (Pattern Migration 2024: clean up and comment) - rust-lang#136844 (Use `const_error!` when possible) - rust-lang#137080 (bootstrap: add more tracing to compiler/std/llvm flows) - rust-lang#137101 (`invalid_from_utf8[_unchecked]`: also lint inherent methods) - rust-lang#137140 (Fix const items not being allowed to be called `r#move` or `r#static`) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#137140 - Noratrieb:const-move, r=jieyouxu,compiler-errors Fix const items not being allowed to be called `r#move` or `r#static` Because of an ambiguity with const closures, the parser needs to ensure that for a const item, the `const` keyword isn't followed by a `move` or `static` keyword, as that would indicate a const closure: ```rust fn main() { const move // ... } ``` This check did not take raw identifiers into account, therefore being unable to distinguish between `const move` and `const r#move`. The latter is obviously not a const closure, so it should be allowed as a const item. This fixes the check in the parser to only treat `const ...` as a const closure if it's followed by the *proper keyword*, and not a raw identifier. Additionally, this adds a large test that tests for all raw identifiers in all kinds of positions, including `const`, to prevent issues like this one from occurring again. fixes rust-lang#137128

rustbot assigned jieyouxu Feb 16, 2025

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Feb 16, 2025

jieyouxu reviewed Feb 16, 2025

View reviewed changes

tests/ui/parser/raw/raw-idents.rs Outdated Show resolved Hide resolved

This comment was marked as resolved.

# to view

Noratrieb force-pushed the const-move branch from d4d2941 to c03b67a Compare February 16, 2025 17:09

compiler-errors approved these changes Feb 16, 2025

View reviewed changes

Noratrieb added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 16, 2025

jieyouxu requested changes Feb 16, 2025

View reviewed changes

tests/ui/parser/raw/raw-idents.rs Outdated Show resolved Hide resolved

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 16, 2025

Noratrieb force-pushed the const-move branch from c03b67a to 8a02724 Compare February 16, 2025 17:21

Noratrieb added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 16, 2025

jieyouxu approved these changes Feb 16, 2025

View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 16, 2025

jieyouxu removed the T-lang Relevant to the language team, which will review and decide on the PR/issue. label Feb 16, 2025

workingjubilee mentioned this pull request Feb 16, 2025

Rollup of 12 pull requests #137153

Closed

matthiaskrgr mentioned this pull request Feb 17, 2025

Rollup of 7 pull requests #137163

Merged

traviscross approved these changes Feb 17, 2025

View reviewed changes

bors merged commit f071099 into rust-lang:master Feb 17, 2025
6 checks passed

rustbot added this to the 1.87.0 milestone Feb 17, 2025

Noratrieb deleted the const-move branch February 17, 2025 12:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Fix const items not being allowed to be called `r#move` or `r#static` #137140

Fix const items not being allowed to be called `r#move` or `r#static` #137140

Uh oh!

Noratrieb commented Feb 16, 2025

Uh oh!

rustbot commented Feb 16, 2025

Uh oh!

Noratrieb commented Feb 16, 2025

Uh oh!

jieyouxu left a comment

Uh oh!

Uh oh!

This comment was marked as resolved.

Noratrieb commented Feb 16, 2025

Uh oh!

compiler-errors left a comment

Uh oh!

Noratrieb commented Feb 16, 2025

Uh oh!

Uh oh!

jieyouxu left a comment

Uh oh!

Noratrieb commented Feb 16, 2025

Uh oh!

bors commented Feb 16, 2025

Uh oh!

Uh oh!

Uh oh!

Fix const items not being allowed to be called r#move or r#static #137140

Fix const items not being allowed to be called r#move or r#static #137140

Uh oh!

Conversation

Noratrieb commented Feb 16, 2025

Uh oh!

rustbot commented Feb 16, 2025

Uh oh!

Noratrieb commented Feb 16, 2025

Uh oh!

jieyouxu left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

This comment was marked as resolved.

Noratrieb commented Feb 16, 2025

Uh oh!

compiler-errors left a comment

Choose a reason for hiding this comment

Uh oh!

Noratrieb commented Feb 16, 2025

Uh oh!

Uh oh!

jieyouxu left a comment

Choose a reason for hiding this comment

Uh oh!

Noratrieb commented Feb 16, 2025

Uh oh!

bors commented Feb 16, 2025

Uh oh!

Uh oh!

Uh oh!

Fix const items not being allowed to be called `r#move` or `r#static` #137140

Fix const items not being allowed to be called `r#move` or `r#static` #137140