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

Return equal for two identical projections #109433

Merged
merged 2 commits into from
Mar 24, 2023

Conversation

chenyukang
Copy link
Member

@chenyukang chenyukang commented Mar 21, 2023

Fixes #109188

@rustbot
Copy link
Collaborator

rustbot commented Mar 21, 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. labels Mar 21, 2023
@chenyukang
Copy link
Member Author

r? @wesleywiser

@rustbot rustbot assigned wesleywiser and unassigned lcnr Mar 21, 2023
"we captured two identical projections: capture1 = {:?}, capture2 = {:?}",
capture1, capture2
);
// return Equal for two identical projections
Copy link
Contributor

Choose a reason for hiding this comment

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

it looks like this could be a delay_span_bug instead? 🤔

Copy link
Member Author

Choose a reason for hiding this comment

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

yes, I will make a change.

Copy link
Member Author

Choose a reason for hiding this comment

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

I add delay_span_bug and also keep the std::cmp::Ordering::Equal so that we keep minimal change since we need to return Ordering type for the sort_by function.

@bugadani
Copy link
Contributor

Keep in mind that the "Partially" word in the PR description has no effect and github will close the issue if this is merged, regardless of the fact that this PR only seems to address part of the issue.

@chenyukang
Copy link
Member Author

Keep in mind that the "Partially" word in the PR description has no effect and github will close the issue if this is merged, regardless of the fact that this PR only seems to address part of the issue.

Thanks for the reminder, I will create another issue for that case in the comment as it is a different issue.

@chenyukang
Copy link
Member Author

oh, it's my fix make the second test case crash in another place, I will change this PR to WIP and continue work on it.

@chenyukang chenyukang marked this pull request as draft March 21, 2023 13:00
@chenyukang
Copy link
Member Author

The root cause is different, so I create another issue #109523 to track it.

@chenyukang chenyukang marked this pull request as ready for review March 23, 2023 08:55
@lcnr
Copy link
Contributor

lcnr commented Mar 23, 2023

r? @lcnr

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Mar 23, 2023

📌 Commit 7bffe94 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 Mar 23, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 24, 2023
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#109406 (Remove outdated comments)
 - rust-lang#109433 (Return equal for two identical projections)
 - rust-lang#109495 (Implement non-const `Destruct` trait in new solver)
 - rust-lang#109519 (Link against libc++ on AIX)
 - rust-lang#109550 (Make helper functions private in fn_ctxt/adjust_fulfillment_errors)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 98254c5 into rust-lang:master Mar 24, 2023
@rustbot rustbot added this to the 1.70.0 milestone Mar 24, 2023
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ICE: entered unreachable code: we captured two identical projections
6 participants