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

Remove ordering traits from OutlivesConstraint #93089

Merged
merged 1 commit into from
Jan 25, 2022

Conversation

pierwill
Copy link
Member

@pierwill pierwill commented Jan 19, 2022

In two cases where this ordering was used, I've replaced the sorting to use a key that does not rely on DefId being Ord. This is part of #90317. If I understand correctly, whether this is correct depends on whether the RegionVids are tracked during incremental compilation. But I might be mistaken in this approach. cc @cjgillot

…straint`

In two cases where this ordering was used, I've replaced the sorting
to use a key that does not include DefId. I'm not sure this is correct
in terms of our goals from rust-lang#90317, or otherwise.
@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jan 19, 2022
@rust-highfive
Copy link
Collaborator

r? @michaelwoerister

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 19, 2022
@pierwill
Copy link
Member Author

pierwill commented Jan 19, 2022

The passing tests do inspire some confidence here.

@michaelwoerister
Copy link
Member

Thanks for the PR, @pierwill!

Looks good to me. HashStable for RegionVid hashes the value verbatim, so it should already be stable.

@bors r+ rollup=never (let's still make this easily bisectable)

@bors
Copy link
Contributor

bors commented Jan 20, 2022

📌 Commit 7f16d0e has been approved by michaelwoerister

@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 Jan 20, 2022
@bors
Copy link
Contributor

bors commented Jan 25, 2022

⌛ Testing commit 7f16d0e with merge 17dfae7...

@bors
Copy link
Contributor

bors commented Jan 25, 2022

☀️ Test successful - checks-actions
Approved by: michaelwoerister
Pushing 17dfae7 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 25, 2022
@bors bors merged commit 17dfae7 into rust-lang:master Jan 25, 2022
@rustbot rustbot added this to the 1.60.0 milestone Jan 25, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (17dfae7): comparison url.

Summary: This benchmark run did not return any relevant results.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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.

6 participants