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

Use error term in projection if missing associated item in new solver #111488

Merged
merged 1 commit into from
May 16, 2023

Conversation

compiler-errors
Copy link
Member

We were previously delaying a bug but not bailing, leading to an ICE in the tcx.type_of(assoc_def.item.def_id) call below.

@rustbot
Copy link
Collaborator

rustbot commented May 12, 2023

r? @lcnr

(rustbot has picked a reviewer for you, use r? to override)

@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 12, 2023
@rustbot
Copy link
Collaborator

rustbot commented May 12, 2023

Some changes occurred to the core trait solver

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

Comment on lines 133 to 138
.const_error_with_guaranteed(
tcx.type_of(goal.predicate.def_id())
.subst(tcx, goal.predicate.projection_ty.substs),
guar,
)
.into(),
Copy link
Contributor

@lcnr lcnr May 16, 2023

Choose a reason for hiding this comment

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

realized that the naming for ty_error and const_error is inconsistent afaict 🤔 we should unify these.

Probably makes sense to open a github issue for that unless you have some time @compiler-errors .

Copy link
Member

Choose a reason for hiding this comment

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

this was done in #111570 which probably means this PR needs to be rebased

@lcnr
Copy link
Contributor

lcnr commented May 16, 2023

@bors r+ rollup

@bors
Copy link
Contributor

bors commented May 16, 2023

📌 Commit a5ce6e843839f3a12e7e123c8ae142d62090da1f 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 16, 2023
@lcnr
Copy link
Contributor

lcnr commented May 16, 2023

@bors r-

probably needs a rebase

@bors 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 May 16, 2023
@compiler-errors
Copy link
Member Author

lol yes boxy is right, i should rebase this

@compiler-errors
Copy link
Member Author

@bors r=lcnr

@bors
Copy link
Contributor

bors commented May 16, 2023

📌 Commit 8921391 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 16, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request May 16, 2023
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#107680 (Hide repr attribute from doc of types without guaranteed repr)
 - rust-lang#111488 (Use error term in projection if missing associated item in new solver)
 - rust-lang#111533 (Handle error body in generator layout)
 - rust-lang#111573 (Erase `ReError` properly)
 - rust-lang#111592 (Change Vec examples to not assert exact capacity except where it is guaranteed)
 - rust-lang#111610 (fix(diagnostic): wrap parens for ref impl trait param)
 - rust-lang#111642 ([rustdoc] Only keep impl blocks from bodies)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit c78a67b into rust-lang:master May 16, 2023
@rustbot rustbot added this to the 1.71.0 milestone May 16, 2023
@compiler-errors compiler-errors deleted the error-term branch August 11, 2023 20:00
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.

None yet

5 participants