Skip to content

Flush errors before deep normalize in dropck_outlives #140947

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.

Sign up for GitHub

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

Jump to bottom
Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Flush errors before deep normalize in dropck_outlives #140947

wants to merge 2 commits into from
+128 −11

Conversation

compiler-errors
Copy link
Member

Deep normalization doesn't allow the ocx to have pending obligations, so process them before deeply normalizing.

Fixes #140931
Fixes #140462

@rustbot
Copy link
Collaborator

rustbot commented May 12, 2025

r? @petrochenkov

rustbot has assigned @petrochenkov.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@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. labels May 12, 2025
@compiler-errors
Copy link
Member Author

r? lcnr

@rustbot rustbot assigned lcnr and unassigned petrochenkov May 12, 2025
@lcnr
Copy link
Contributor

lcnr commented May 12, 2025

@bors r+ rollup

@lcnr
Copy link
Contributor

lcnr commented May 12, 2025

@bors r-

@bors
Copy link
Collaborator

bors commented May 12, 2025

📌 Commit e2b4654 has been approved by lcnr

It is now in the queue for this repository.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. 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. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 12, 2025
lcnr
lcnr reviewed May 12, 2025
View reviewed changes
compiler/rustc_trait_selection/src/traits/query/dropck_outlives.rs Outdated
if !errors.is_empty() {
return Err(errors);
}

ocx.deeply_normalize(&cause, param_env, ty)?;

let errors = ocx.select_where_possible();
Copy link
Contributor

@lcnr lcnr May 12, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

are these errors always empty now?

Copy link
Member Author

Choose a reason for hiding this comment

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

yeah

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lcnr lcnr lcnr left review comments

Assignees

@lcnr lcnr

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.
Projects
None yet
Milestone
No milestone
5 participants
@compiler-errors @rustbot @lcnr @bors @petrochenkov