Skip to content

Don't call ty::Const::normalize in error reporting - #130712

Merged
bors merged 2 commits into
rust-lang:masterfrom
compiler-errors:const-eval-error-reporting
Sep 23, 2024
Merged

Don't call ty::Const::normalize in error reporting#130712
bors merged 2 commits into
rust-lang:masterfrom
compiler-errors:const-eval-error-reporting

Conversation

@compiler-errors

@compiler-errorscompiler-errors commented Sep 22, 2024

Copy link
Copy Markdown
Contributor

We do this to ensure that trait refs with unevaluated consts have those consts simplified to their evaluated forms. Instead, use try_normalize_erasing_regions.

NOTE: This has the side-effect of erasing regions from all of our trait refs. If this is too much to review or you think it's too opinionated of a diagnostics change, then I could split out the effective change (i.e. erasing regions from this impl suggestion) into another PR and have someone else review it.

r? @BoxyUwU

@rustbotrustbot 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 Sep 22, 2024
@BoxyUwU

Copy link
Copy Markdown
Member

@bors r+ rollup

@bors

bors commented Sep 22, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit 01d19d7 has been approved by BoxyUwU

It is now in the queue for this repository.

@borsbors 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 Sep 22, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Sep 22, 2024
…eporting, r=BoxyUwU
Don't call `ty::Const::normalize` in error reporting
We do this to ensure that trait refs with unevaluated consts have those consts simplified to their evaluated forms. Instead, use `try_normalize_erasing_regions`.
**NOTE:** This has the side-effect of erasing regions from all of our trait refs. If this is too much to review or you think it's too opinionated of a diagnostics change, then I could split out the effective change (i.e. erasing regions from this impl suggestion) into another PR and have someone else review it.
r? `@BoxyUwU`
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 22, 2024
…iaskrgr
Rollup of 8 pull requests
Successful merges:
- rust-lang#122565 (Try to write the panic message with a single `write_all` call)
- rust-lang#129550 (Add str.as_str() for easy Deref to string slices)
- rust-lang#130659 (Support `char::encode_utf16` in const scenarios.)
- rust-lang#130705 (No longer mark RTN as incomplete)
- rust-lang#130712 (Don't call `ty::Const::normalize` in error reporting)
- rust-lang#130713 (Mark `u8::make_ascii_uppercase` and `u8::make_ascii_lowercase` as const.)
- rust-lang#130714 (Introduce `structurally_normalize_const`, use it in `rustc_hir_typeck`)
- rust-lang#130715 (Replace calls to `ty::Const::{try_}eval` in mir build/pattern analysis)
r? `@ghost`
`@rustbot` modify labels: rollup
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Sep 23, 2024
…eporting, r=BoxyUwU
Don't call `ty::Const::normalize` in error reporting
We do this to ensure that trait refs with unevaluated consts have those consts simplified to their evaluated forms. Instead, use `try_normalize_erasing_regions`.
**NOTE:** This has the side-effect of erasing regions from all of our trait refs. If this is too much to review or you think it's too opinionated of a diagnostics change, then I could split out the effective change (i.e. erasing regions from this impl suggestion) into another PR and have someone else review it.
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 23, 2024
…iaskrgr
Rollup of 10 pull requests
Successful merges:
- rust-lang#129550 (Add str.as_str() for easy Deref to string slices)
- rust-lang#130344 (Handle unsized consts with type `str` in v0 symbol mangling)
- rust-lang#130659 (Support `char::encode_utf16` in const scenarios.)
- rust-lang#130705 (No longer mark RTN as incomplete)
- rust-lang#130712 (Don't call `ty::Const::normalize` in error reporting)
- rust-lang#130713 (Mark `u8::make_ascii_uppercase` and `u8::make_ascii_lowercase` as const.)
- rust-lang#130714 (Introduce `structurally_normalize_const`, use it in `rustc_hir_typeck`)
- rust-lang#130715 (Replace calls to `ty::Const::{try_}eval` in mir build/pattern analysis)
- rust-lang#130723 (Add test for `available_parallelism()`)
- rust-lang#130726 (tests: Remove spuriously failing vec-tryinto-array codegen test)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 8206036 into rust-lang:masterSep 23, 2024
@rustbotrustbot added this to the 1.83.0 milestone Sep 23, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Sep 23, 2024
Rollup merge of rust-lang#130712 - compiler-errors:const-eval-error-reporting, r=BoxyUwU
Don't call `ty::Const::normalize` in error reporting
We do this to ensure that trait refs with unevaluated consts have those consts simplified to their evaluated forms. Instead, use `try_normalize_erasing_regions`.
**NOTE:** This has the side-effect of erasing regions from all of our trait refs. If this is too much to review or you think it's too opinionated of a diagnostics change, then I could split out the effective change (i.e. erasing regions from this impl suggestion) into another PR and have someone else review it.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@compiler-errors@BoxyUwU@bors@rustbot