Improve infer (_) suggestions in consts and statics
#135044
Merged
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
a4e65fa to
6c5c5ce
Compare
6c5c5ce to
0fd64ef
Compare
oli-obk
approved these changes
Jan 3, 2025
|
@bors r+ |
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jan 3, 2025
…stions-in-const, r=oli-obk Improve infer (`_`) suggestions in `const`s and `static`s Fixes rust-lang#135010. This PR does a few things to (imo) greatly improve the error message when users write something like `static FOO: [i32; _] = [1, 2, 3]`. Firstly, it adapts the recovery code for when we encounter `_` in a const/static to work a bit more like `fn foo() -> _`, and removes the somewhat redundant query `diagnostic_only_typeck`. Secondly, it changes the lowering for `[T; _]` to always lower under the `feature(generic_arg_infer)` logic to `ConstArgKind::Infer`. We still issue the feature error, so it's not doing anything *observable* on the good path, but it does mean that we no longer erroneously interpret `[T; _]`'s array length as a `_` **wildcard expression** (à la destructuring assignment, like `(_, y) = expr`). Lastly it makes the suggestions verbose and fixes (well, suppresses) a bug with stashing and suggestions. r? oli-obk
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 3, 2025
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#133420 (Switch rtems target to panic unwind) - rust-lang#134965 (Make Boxy UwU) - rust-lang#135007 (Some type-outlives computation tweaks) - rust-lang#135036 (run-make-support: adjust assertion printing, add some basic sanity checks) - rust-lang#135043 (rustdoc: treat `allowed_through_unstable_modules` as deprecation) - rust-lang#135044 (Improve infer (`_`) suggestions in `const`s and `static`s) - rust-lang#135058 (refactor bootstrap path resolution) - rust-lang#135061 (crashes: add latest batch of tests) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 3, 2025
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#133420 (Switch rtems target to panic unwind) - rust-lang#134965 (Make Boxy UwU) - rust-lang#135007 (Some type-outlives computation tweaks) - rust-lang#135036 (run-make-support: adjust assertion printing, add some basic sanity checks) - rust-lang#135043 (rustdoc: treat `allowed_through_unstable_modules` as deprecation) - rust-lang#135044 (Improve infer (`_`) suggestions in `const`s and `static`s) - rust-lang#135058 (refactor bootstrap path resolution) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 4, 2025
Rollup merge of rust-lang#135044 - compiler-errors:better-infer-suggestions-in-const, r=oli-obk Improve infer (`_`) suggestions in `const`s and `static`s Fixes rust-lang#135010. This PR does a few things to (imo) greatly improve the error message when users write something like `static FOO: [i32; _] = [1, 2, 3]`. Firstly, it adapts the recovery code for when we encounter `_` in a const/static to work a bit more like `fn foo() -> _`, and removes the somewhat redundant query `diagnostic_only_typeck`. Secondly, it changes the lowering for `[T; _]` to always lower under the `feature(generic_arg_infer)` logic to `ConstArgKind::Infer`. We still issue the feature error, so it's not doing anything *observable* on the good path, but it does mean that we no longer erroneously interpret `[T; _]`'s array length as a `_` **wildcard expression** (à la destructuring assignment, like `(_, y) = expr`). Lastly it makes the suggestions verbose and fixes (well, suppresses) a bug with stashing and suggestions. r? oli-obk
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.
Fixes #135010.
This PR does a few things to (imo) greatly improve the error message when users write something like
static FOO: [i32; _] = [1, 2, 3].Firstly, it adapts the recovery code for when we encounter
_in a const/static to work a bit more likefn foo() -> _, and removes the somewhat redundant querydiagnostic_only_typeck.Secondly, it changes the lowering for
[T; _]to always lower under thefeature(generic_arg_infer)logic toConstArgKind::Infer. We still issue the feature error, so it's not doing anything observable on the good path, but it does mean that we no longer erroneously interpret[T; _]'s array length as a_wildcard expression (à la destructuring assignment, like(_, y) = expr).Lastly it makes the suggestions verbose and fixes (well, suppresses) a bug with stashing and suggestions.
r? oli-obk