Skip to content

fix NormalizesTo proof tree issue #124566

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 2 commits into from
May 1, 2024
Merged

Conversation

lcnr
Copy link
Contributor

@lcnr lcnr commented Apr 30, 2024

@rustbot 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Apr 30, 2024
@rustbot
Copy link
Collaborator

rustbot commented Apr 30, 2024

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

Copy link
Member

@compiler-errors compiler-errors left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me

}

impl<'tcx> NormalizesToTermHack<'tcx> {
fn relate(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

deeply_relate? the name relate suggests to me that it returns InferOk

@lcnr
Copy link
Contributor Author

lcnr commented May 1, 2024

@bors r=compiler-errors rollup (new-solver)

@bors
Copy link
Collaborator

bors commented May 1, 2024

📌 Commit f323f9d has been approved by compiler-errors

It is now in the queue for this repository.

@bors 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 May 1, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 1, 2024
…ompiler-errors

fix `NormalizesTo` proof tree issue

fixes rust-lang#124422
cc rust-lang#121848

r? `@compiler-errors`
bors added a commit to rust-lang-ci/rust that referenced this pull request May 1, 2024
…iaskrgr

Rollup of 3 pull requests

Successful merges:

 - rust-lang#124529 (Rewrite select (in the new solver) to use a `ProofTreeVisitor`)
 - rust-lang#124542 (Add diagnostic item for `std::iter::Iterator::enumerate`)
 - rust-lang#124566 (fix `NormalizesTo` proof tree issue)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request May 1, 2024
…iaskrgr

Rollup of 2 pull requests

Successful merges:

 - rust-lang#124542 (Add diagnostic item for `std::iter::Iterator::enumerate`)
 - rust-lang#124566 (fix `NormalizesTo` proof tree issue)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 0dbe07f into rust-lang:master May 1, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request May 1, 2024
Rollup merge of rust-lang#124566 - lcnr:normalizes-to-proof-tree, r=compiler-errors

fix `NormalizesTo` proof tree issue

fixes rust-lang#124422
cc rust-lang#121848

r? ``@compiler-errors``
@rustbot rustbot added this to the 1.80.0 milestone May 1, 2024
@lcnr lcnr deleted the normalizes-to-proof-tree branch May 2, 2024 02:29
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ICE: solver coherence: 'called Result::unwrap() on an Err value: Sorts(ExpectedFound { expected: u32, found: u16 })'
4 participants