Harmonize using root or leaf obligation in trait error reporting by compiler-errors · Pull Request #126142 · rust-lang/rust

compiler-errors · 2024-06-07T22:04:36Z

When #121826 changed the error reporting to use root obligation and not the leafmost obligation, it didn't actually make sure that all the other diagnostics helper functions used the right obligation.

Specifically, when reporting similar impl candidates we are looking for impls of the root obligation, but trying to match them against the trait ref of the leaf obligation.

This does a few other miscellaneous changes. There's a lot more clean-up that could be done here, but working with this code is really grief-inducing due to how messy it has become over the years. Someone really needs to show it love. 😓

r? @estebank

Fixes #126129

jackh726 · 2024-06-08T16:45:49Z

r=me with tests blessed

compiler-errors · 2024-06-12T12:22:15Z

tests/ui/generic-associated-types/assume-gat-normalization-for-nested-goals.next.stderr

   |
 LL |     type Bar<T>: Baz<Self> = i32;
-   |                              ^^^ the trait `Eq<i32>` is not implemented for `i32`, which is required by `i32: Baz<Self>`
+   |                              ^^^ the trait `Eq<i32>` is not implemented for `<Self as Foo>::Bar<()>`, which is required by `i32: Baz<Self>`


The only appreciable difference here is that we actually report the right self type here now.

compiler-errors · 2024-06-12T12:22:21Z

tests/ui/generic-associated-types/assume-gat-normalization-for-nested-goals.next.stderr

  --> $DIR/assume-gat-normalization-for-nested-goals.rs:9:30
   |
 LL |     type Bar<T>: Baz<Self> = i32;
-   |                              ^^^ the trait `Eq<i32>` is not implemented for `i32`, which is required by `i32: Baz<Self>`


This message was also previously just not correct -- Eq<i32> is implemented by i32 lol

compiler-errors · 2024-06-12T23:17:05Z

@bors r=jackh726

bors · 2024-06-12T23:17:08Z

📌 Commit c90b1fc has been approved by jackh726

It is now in the queue for this repository.

…=jackh726 Harmonize using root or leaf obligation in trait error reporting When rust-lang#121826 changed the error reporting to use root obligation and not the leafmost obligation, it didn't actually make sure that all the other diagnostics helper functions used the right obligation. Specifically, when reporting similar impl candidates we are looking for impls of the root obligation, but trying to match them against the trait ref of the leaf obligation. This does a few other miscellaneous changes. There's a lot more clean-up that could be done here, but working with this code is really grief-inducing due to how messy it has become over the years. Someone really needs to show it love. 😓 r? `@estebank` Fixes rust-lang#126129

workingjubilee · 2024-06-13T00:52:59Z

sorry, seems to need a rebase!

workingjubilee · 2024-06-13T00:55:48Z

"conflicts" with https://github.com/rust-lang/rust/pull/126187/files#diff-63c8c70fb480c0c10ffa9ba981d76373b6d6b48327cdd7c317b0d75148904dc6 which adds a use of trait_ref which can be merged by git automatically but does not compile.

@bors r-

workingjubilee · 2024-06-13T01:45:35Z

@bors r=jackh726

bors · 2024-06-13T01:45:37Z

📌 Commit ae24ebe has been approved by jackh726

It is now in the queue for this repository.

…=jackh726 Harmonize using root or leaf obligation in trait error reporting When rust-lang#121826 changed the error reporting to use root obligation and not the leafmost obligation, it didn't actually make sure that all the other diagnostics helper functions used the right obligation. Specifically, when reporting similar impl candidates we are looking for impls of the root obligation, but trying to match them against the trait ref of the leaf obligation. This does a few other miscellaneous changes. There's a lot more clean-up that could be done here, but working with this code is really grief-inducing due to how messy it has become over the years. Someone really needs to show it love. 😓 r? `@estebank` Fixes rust-lang#126129

…kingjubilee Rollup of 11 pull requests Successful merges: - rust-lang#125165 (Migrate `run-make/pgo-branch-weights` to `rmake`) - rust-lang#125674 (Rewrite `symlinked-extern`, `symlinked-rlib` and `symlinked-libraries` `run-make` tests in `rmake.rs` format) - rust-lang#125688 (Walk into alias-eq nested goals even if normalization fails) - rust-lang#126142 (Harmonize using root or leaf obligation in trait error reporting) - rust-lang#126303 (Urls to docs in rust_hir) - rust-lang#126328 (Add Option::is_none_or) - rust-lang#126337 (Add test for walking order dependent opaque type behaviour) - rust-lang#126351 (std::unix::fs::link using direct linkat call for Solaris.) - rust-lang#126353 (Move `MatchAgainstFreshVars` to old solver) - rust-lang#126356 (docs(rustc): Improve discoverable of Cargo docs) - rust-lang#126362 (Make `try_from_target_usize` method public) r? `@ghost` `@rustbot` modify labels: rollup

…kingjubilee Rollup of 10 pull requests Successful merges: - rust-lang#125674 (Rewrite `symlinked-extern`, `symlinked-rlib` and `symlinked-libraries` `run-make` tests in `rmake.rs` format) - rust-lang#125688 (Walk into alias-eq nested goals even if normalization fails) - rust-lang#126142 (Harmonize using root or leaf obligation in trait error reporting) - rust-lang#126303 (Urls to docs in rust_hir) - rust-lang#126328 (Add Option::is_none_or) - rust-lang#126337 (Add test for walking order dependent opaque type behaviour) - rust-lang#126353 (Move `MatchAgainstFreshVars` to old solver) - rust-lang#126356 (docs(rustc): Improve discoverable of Cargo docs) - rust-lang#126358 (safe transmute: support `Single` enums) - rust-lang#126362 (Make `try_from_target_usize` method public) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#126142 - compiler-errors:trait-ref-split, r=jackh726 Harmonize using root or leaf obligation in trait error reporting When rust-lang#121826 changed the error reporting to use root obligation and not the leafmost obligation, it didn't actually make sure that all the other diagnostics helper functions used the right obligation. Specifically, when reporting similar impl candidates we are looking for impls of the root obligation, but trying to match them against the trait ref of the leaf obligation. This does a few other miscellaneous changes. There's a lot more clean-up that could be done here, but working with this code is really grief-inducing due to how messy it has become over the years. Someone really needs to show it love. 😓 r? ``@estebank`` Fixes rust-lang#126129

rustbot assigned estebank Jun 7, 2024

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 Jun 7, 2024

This comment has been minimized.

Sign in to view

rust-lang deleted a comment Jun 7, 2024

compiler-errors force-pushed the trait-ref-split branch from d2fa92b to c90b1fc Compare June 8, 2024 18:15

rustbot added the WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) label Jun 8, 2024

compiler-errors commented Jun 12, 2024

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 Jun 12, 2024

compiler-errors mentioned this pull request Jun 13, 2024

Rollup of 8 pull requests #126364

Closed

workingjubilee closed this Jun 13, 2024

workingjubilee reopened this Jun 13, 2024

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 13, 2024

compiler-errors added 4 commits June 12, 2024 20:57

Harmonize use of leaf and root obligation in trait error reporting

c453c82

Bless and add ICE regression test

93d83c8

Stop passing both trait pred and trait ref

f8d12d9

Stop passing traitref/traitpredicate by ref

2c0348a

This comment has been minimized.

Sign in to view

Rebase fallout

ae24ebe

compiler-errors force-pushed the trait-ref-split branch from c90b1fc to ae24ebe Compare June 13, 2024 01:17

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 13, 2024

workingjubilee mentioned this pull request Jun 13, 2024

Rollup of 11 pull requests #126369

Closed

workingjubilee mentioned this pull request Jun 13, 2024

Rollup of 10 pull requests #126374

Merged

bors merged commit 25c55c5 into rust-lang:master Jun 13, 2024

rustbot added this to the 1.81.0 milestone Jun 13, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Harmonize using root or leaf obligation in trait error reporting#126142

Harmonize using root or leaf obligation in trait error reporting#126142
bors merged 5 commits intorust-lang:masterfrom
compiler-errors:trait-ref-split

compiler-errors commented Jun 7, 2024 •

edited

Loading

Uh oh!

This comment has been minimized.

jackh726 commented Jun 8, 2024

Uh oh!

compiler-errors Jun 12, 2024

Uh oh!

compiler-errors Jun 12, 2024

Uh oh!

compiler-errors commented Jun 12, 2024

Uh oh!

bors commented Jun 12, 2024

Uh oh!

workingjubilee commented Jun 13, 2024

Uh oh!

workingjubilee commented Jun 13, 2024

Uh oh!

This comment has been minimized.

workingjubilee commented Jun 13, 2024

Uh oh!

bors commented Jun 13, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Uh oh!

Conversation

compiler-errors commented Jun 7, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment has been minimized.

jackh726 commented Jun 8, 2024

Uh oh!

compiler-errors Jun 12, 2024

Choose a reason for hiding this comment

Uh oh!

compiler-errors Jun 12, 2024

Choose a reason for hiding this comment

Uh oh!

compiler-errors commented Jun 12, 2024

Uh oh!

bors commented Jun 12, 2024

Uh oh!

workingjubilee commented Jun 13, 2024

Uh oh!

workingjubilee commented Jun 13, 2024

Uh oh!

This comment has been minimized.

workingjubilee commented Jun 13, 2024

Uh oh!

bors commented Jun 13, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

compiler-errors commented Jun 7, 2024 •

edited

Loading