Detect and provide suggestion for &raw EXPR#139392
Merged
Merged
Conversation
Collaborator
|
r? @davidtwco rustbot has assigned @davidtwco. Use |
rustbot
added
S-waiting-on-review
compiler-errors
commented
Apr 4, 2025
| self.error_remove_borrow_lifetime(span, lt.ident.span.until(expr.span)); | ||
| } | ||
|
|
||
| // Add expected tokens if we parsed `&raw` as an expression. |
Contributor
Author
There was a problem hiding this comment.
🤔 do we know anything about the parser grammar such that we could eagerly recover here (if self.may_recover(), of course), at least in some cases?
I don't think we ever expect an identifier token to follow another expr in valid rust, so if we see &raw IDENT, we could actually do recovery here rather than just failing later on in parsing.
fmease
reviewed
Apr 5, 2025
| // guides recovery in case we write `&raw expr`. | ||
| if borrow_kind == ast::BorrowKind::Ref | ||
| && mutbl == ast::Mutability::Not | ||
| && matches!(&expr.kind, ExprKind::Path(None, p) if p.is_ident(kw::Raw)) |
Member
There was a problem hiding this comment.
(minor) is_ident or this matches! needs to account for raw identifiers, so we can exclude r#raw (raw raw) here
Contributor
Author
There was a problem hiding this comment.
This is a parsed ident, not an ident token, so we don't have a way to distinguish r#raw here, since ident is just a span and a symbol.
Contributor
There was a problem hiding this comment.
Hmm 🤔 why is this being checked on the parsed expr and not as a lookahead after parsing the borrow modifiers? I guess kinda related to the recovery comment above, but would trivially allow checking for non-raw ident
Contributor
Author
There was a problem hiding this comment.
Well we do want to avoid putting the expectation down for something like &raw.field
Contributor
Author
|
r? oli-obk |
Contributor
|
@bors r+ |
Collaborator
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 14, 2025
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#139127 (Fix up partial res of segment in primitive resolution hack) - rust-lang#139392 (Detect and provide suggestion for `&raw EXPR`) - rust-lang#139767 (Visit place in `BackwardIncompatibleDropHint` statement) - rust-lang#139777 (Remove `define_debug_via_print` for `ExistentialProjection`, use regular structural debug impl) - rust-lang#139796 (ptr docs: add missing backtics around 'usize') - rust-lang#139801 (Add myself to mailmap) - rust-lang#139804 (use `realpath` in `bootstrap.py` when creating build-dir) - rust-lang#139807 (Improve wording of post-merge report) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 14, 2025
Rollup merge of rust-lang#139392 - compiler-errors:raw-expr, r=oli-obk Detect and provide suggestion for `&raw EXPR` When emitting an error in the parser, and we detect that the previous token was `raw` and we *could* have consumed `const`/`mut`, suggest that this may have been a mistyped raw ref expr. To do this, we add `const`/`mut` to the expected token set when parsing `&raw` as an expression (which does not affect the "good path" of parsing, for the record). This is kind of a rudimentary error improvement, since it doesn't actually attempt to recover anything, leading to some other knock-on errors b/c we still treat `&raw` as the expression that was parsed... but at least we add the suggestion! I don't think the parser grammar means we can faithfully recover `&raw EXPR` early, i.e. during `parse_expr_borrow`. Fixes rust-lang#133231
github-actions Bot
pushed a commit
to model-checking/verify-rust-std
that referenced
this pull request
Apr 19, 2025
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#139127 (Fix up partial res of segment in primitive resolution hack) - rust-lang#139392 (Detect and provide suggestion for `&raw EXPR`) - rust-lang#139767 (Visit place in `BackwardIncompatibleDropHint` statement) - rust-lang#139777 (Remove `define_debug_via_print` for `ExistentialProjection`, use regular structural debug impl) - rust-lang#139796 (ptr docs: add missing backtics around 'usize') - rust-lang#139801 (Add myself to mailmap) - rust-lang#139804 (use `realpath` in `bootstrap.py` when creating build-dir) - rust-lang#139807 (Improve wording of post-merge report) r? `@ghost` `@rustbot` modify labels: rollup
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Jun 12, 2026
…=Kivooeo Don't recover `&raw EXPR` as a missing comma The parser already has a targeted suggestion for `&raw EXPR`, added in rust-lang#139392, telling the user that `&raw` must be followed by `const` or `mut`. In comma-separated expression lists, the generic missing-comma recovery would then treat the expression after `raw` as the next list element. That produced follow-up diagnostics like: - `help: missing ','` - `cannot find value raw in this scope` - an arity error for calls such as `takes_raw_ptr(&raw x)` This PR avoids that comma recovery when we are already in the `&raw` missing-`const`/`mut` diagnostic path. For function calls, it preserves the call expression with a single error argument, so useful later diagnostics such as `cannot find function f` are still emitted. Fixes rust-lang#157015.
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Jun 12, 2026
…=Kivooeo Don't recover `&raw EXPR` as a missing comma The parser already has a targeted suggestion for `&raw EXPR`, added in rust-lang#139392, telling the user that `&raw` must be followed by `const` or `mut`. In comma-separated expression lists, the generic missing-comma recovery would then treat the expression after `raw` as the next list element. That produced follow-up diagnostics like: - `help: missing ','` - `cannot find value raw in this scope` - an arity error for calls such as `takes_raw_ptr(&raw x)` This PR avoids that comma recovery when we are already in the `&raw` missing-`const`/`mut` diagnostic path. For function calls, it preserves the call expression with a single error argument, so useful later diagnostics such as `cannot find function f` are still emitted. Fixes rust-lang#157015.
pull Bot
pushed a commit
to xtqqczze/rust-lang-miri
that referenced
this pull request
Jun 13, 2026
Don't recover `&raw EXPR` as a missing comma The parser already has a targeted suggestion for `&raw EXPR`, added in rust-lang/rust#139392, telling the user that `&raw` must be followed by `const` or `mut`. In comma-separated expression lists, the generic missing-comma recovery would then treat the expression after `raw` as the next list element. That produced follow-up diagnostics like: - `help: missing ','` - `cannot find value raw in this scope` - an arity error for calls such as `takes_raw_ptr(&raw x)` This PR avoids that comma recovery when we are already in the `&raw` missing-`const`/`mut` diagnostic path. For function calls, it preserves the call expression with a single error argument, so useful later diagnostics such as `cannot find function f` are still emitted. Fixes rust-lang/rust#157015.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
When emitting an error in the parser, and we detect that the previous token was
rawand we could have consumedconst/mut, suggest that this may have been a mistyped raw ref expr. To do this, we addconst/mutto the expected token set when parsing&rawas an expression (which does not affect the "good path" of parsing, for the record).This is kind of a rudimentary error improvement, since it doesn't actually attempt to recover anything, leading to some other knock-on errors b/c we still treat
&rawas the expression that was parsed... but at least we add the suggestion! I don't think the parser grammar means we can faithfully recover&raw EXPRearly, i.e. duringparse_expr_borrow.Fixes #133231