Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Record impl args in the proof tree in new solver #124759

Merged
merged 2 commits into from
May 6, 2024

Conversation

compiler-errors
Copy link
Member

@compiler-errors compiler-errors commented May 5, 2024

Rather than rematching them during select.

Also use ImplSource::Param instead of ImplSource::Builtin for alias-bound candidates, so we don't ICE in Instance::resolve.

r? lcnr

@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 labels May 5, 2024
@rustbot
Copy link
Collaborator

rustbot commented May 5, 2024

Some changes occurred to the core trait solver

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

Copy link
Contributor

@lcnr lcnr 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 after nits

compiler/rustc_middle/src/traits/solve/inspect.rs Outdated Show resolved Hide resolved
@compiler-errors
Copy link
Member Author

@bors r=lcnr

@bors
Copy link
Contributor

bors commented May 6, 2024

📌 Commit e3f1760 has been approved by lcnr

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 6, 2024
@rust-log-analyzer

This comment has been minimized.

@compiler-errors
Copy link
Member Author

@bors r=lcnr

@bors
Copy link
Contributor

bors commented May 6, 2024

📌 Commit e347239 has been approved by lcnr

It is now in the queue for this repository.

@compiler-errors
Copy link
Member Author

@bors rollup

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 6, 2024
Record impl args in the proof tree in new solver

Rather than rematching them during select.

Also use `ImplSource::Param` instead of `ImplSource::Builtin` for alias-bound candidates, so we don't ICE in `Instance::resolve`.

r? lcnr
bors added a commit to rust-lang-ci/rust that referenced this pull request May 6, 2024
…iaskrgr

Rollup of 4 pull requests

Successful merges:

 - rust-lang#124209 (Make check-cfg docs more user-friendly)
 - rust-lang#124759 (Record impl args in the proof tree in new solver)
 - rust-lang#124809 (borrowck: prepopulate opaque storage more eagerly)
 - rust-lang#124815 (Update books)

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

Rollup of 3 pull requests

Successful merges:

 - rust-lang#124759 (Record impl args in the proof tree in new solver)
 - rust-lang#124809 (borrowck: prepopulate opaque storage more eagerly)
 - rust-lang#124815 (Update books)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit f76c8f7 into rust-lang:master May 6, 2024
6 checks passed
@rustbot rustbot added this to the 1.80.0 milestone May 6, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request May 6, 2024
Rollup merge of rust-lang#124759 - compiler-errors:impl-args, r=lcnr

Record impl args in the proof tree in new solver

Rather than rematching them during select.

Also use `ImplSource::Param` instead of `ImplSource::Builtin` for alias-bound candidates, so we don't ICE in `Instance::resolve`.

r? lcnr
Sign up for free to join this conversation on GitHub. Already have an account? Sign in 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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants