Remove `PartialOrd`, `Ord` from `LocalDefId` by pierwill · Pull Request #90408 · rust-lang/rust

pierwill · 2021-10-29T21:18:30Z

Part of work on #90317.

rust-highfive · 2021-10-29T21:18:33Z

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

pierwill · 2021-10-29T21:19:39Z

cjgillot

Thanks for the PR @pierwill! I left a few comments.
Those trait bounds on LocalDefId are used a lot, it may be easier to handle Idx and PartialOrd/Ord separately.
Changing data structures means we will have to be careful about perf implications.

pierwill · 2021-10-30T15:03:22Z

Those trait bounds on LocalDefId are used a lot, it may be easier to handle Idx and PartialOrd/Ord separately.

Thanks for reviewing, @cjgillot! I'll work on just the ordering traits for now. I also might see if DefId is easier to start with (#90317 (comment)).

pierwill · 2021-10-30T15:14:52Z

Those trait bounds on LocalDefId are used a lot, it may be easier to handle Idx and PartialOrd/Ord separately.

Looks like Idx requires Ord...

rust/compiler/rustc_index/src/vec.rs

Line 15 in 2b643e9

pubtraitIdx:Copy + 'static + Ord + Debug + Hash{

Remove `rustc_hir::hir_id::HirIdVec` See rust-lang#90408 (comment): > IIRC, `HirIdVec` is never used, you can delete it. PR rust-lang#72015 has been abandoned. r? `@cjgillot`

cjgillot

Thanks @pierwill. I added a few nits. The main remark is that we'd like to remove the PartialOrd/Ord impl for HirId, since it has exactly the same issue as the impl for LocalDefId.

pierwill · 2021-12-13T16:29:53Z

This change has been failing the same Windows backtrace test as #89836. We're assessing whether to bless the test or continue digging.

This has been causing failures in CI here and in rust-lang#90408. A comment there (rust-lang#90408 (comment)) suggested blessing the output; this commit does that manually.

pierwill · 2021-12-15T15:59:43Z

Once #89836 is merged (🤞🤞), this should be ready to go. :)

matthiaskrgr · 2021-12-16T12:26:07Z

Just for the record, the failure here #90408 (comment) is probably unrelated to this PR since it happened in other ci-runs as well :( : #91995 (comment)

Made a tracking ticket: #92000

pierwill · 2021-12-16T15:29:36Z

This is ready for another bors attempt! @cjgillot

…

On Thu, Dec 16, 2021 at 6:26 AM Matthias Krüger ***@***.***> wrote: Just for the record, the failure here #90408 (comment) <#90408 (comment)> is probably unrelated to this PR since it happened in other ci-runs as well :( : #91995 (comment) <#91995 (comment)> Made a tracking ticket: #92000 <#92000> — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#90408 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AEV3NIFIUBXWJUREWIOIXNDURHLGXANCNFSM5HAF6KFQ> . Triage notifications on the go with GitHub Mobile for iOS <https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675> or Android <https://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub>.

Implement `Ord`, `PartialOrd` for SpanData

bjorn3 · 2021-12-22T17:36:24Z

@bors r=cjgillot

bors · 2021-12-22T17:36:25Z

📌 Commit e6ff0ba has been approved by cjgillot

bors · 2021-12-22T17:36:26Z

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

bors · 2021-12-22T22:33:14Z

⌛ Testing commit e6ff0ba with merge e983092...

bors · 2021-12-23T01:47:02Z

☀️ Test successful - checks-actions
Approved by: cjgillot
Pushing e983092 to master...

rust-timer · 2021-12-23T03:16:56Z

Finished benchmarking commit (e983092): comparison url.

Summary: This change led to large relevant mixed results 🤷 in compiler performance.

Large improvement in instruction counts (up to -3.7% on full builds of deeply-nested-async)
Large regression in instruction counts (up to 2.9% on incr-unchanged builds of deeply-nested-async)

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

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression

pierwill · 2021-12-23T17:46:07Z

See previous comment here: #90408 (comment).

@rustbot label: +perf-regression-triaged

rust-highfive assigned jackh726 Oct 29, 2021

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 29, 2021

rust-highfive assigned cjgillot and unassigned jackh726 Oct 29, 2021

This comment has been minimized.
Sign in to view

cjgillot reviewed Oct 30, 2021
View reviewed changes

Comment threadcompiler/rustc_hir/src/definitions.rs Outdated
Comment threadcompiler/rustc_hir/src/definitions.rs Outdated
Comment threadcompiler/rustc_hir/src/hir.rs Outdated
Comment threadcompiler/rustc_hir/src/hir_id.rs Outdated
Comment threadcompiler/rustc_span/src/span_encoding.rs Outdated

cjgillot 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-review Status: Awaiting review from the assignee but also interested parties. labels Oct 30, 2021

pierwill changed the title ~~[WIP] Remove PartialOrd, Ord, and Idx from LocalDefId~~[WIP] Remove PartialOrd, Ord from LocalDefIdOct 30, 2021

pierwill force-pushed the untrack-localdefid-90317 branch from 624198a to ae5bf6aCompare October 30, 2021 15:12

pierwill changed the title ~~[WIP] Remove PartialOrd, Ord from LocalDefId~~[WIP] Remove PartialOrd, Ord from LocalDefIdOct 30, 2021

This comment has been minimized.
Sign in to view

pierwill mentioned this pull request Oct 31, 2021
Remove rustc_hir::hir_id::HirIdVec#90450
Merged

This comment has been minimized.
Sign in to view

pierwill force-pushed the untrack-localdefid-90317 branch from 39238b3 to 8b48d70Compare November 2, 2021 18:39

pierwill changed the title ~~[WIP] Remove PartialOrd, Ord from LocalDefId~~Remove PartialOrd, Ord from LocalDefIdNov 2, 2021

pierwill requested a review from cjgillot November 2, 2021 18:40

This comment has been minimized.
Sign in to view

cjgillot reviewed Nov 2, 2021
View reviewed changes

Comment threadcompiler/rustc_span/src/lib.rs Outdated
Comment threadcompiler/rustc_data_structures/src/graph/vec_graph/mod.rs Outdated
Comment threadcompiler/rustc_span/src/lib.rs Outdated
Comment threadcompiler/rustc_hir/src/hir_id.rs Outdated

This comment has been minimized.
Sign in to view

pierwill requested a review from cjgillot November 2, 2021 23:08

pierwill commented Nov 2, 2021
View reviewed changes

Comment threadcompiler/rustc_index/src/vec.rs

pierwill force-pushed the untrack-localdefid-90317 branch from 439c33d to 46a508bCompare December 13, 2021 16:35

pierwill force-pushed the untrack-localdefid-90317 branch from 46a508b to f00fd59Compare December 16, 2021 05:20

pierwill added 3 commits December 22, 2021 10:50

Remove PartialOrd and Ord from LocalDefId
8df9248
Implement `Ord`, `PartialOrd` for SpanData

Require Ord for rustc_index::SparseBitSet::last_set_in
a4a8c24

rustc VecGraph: require the index type to implement Ord
e6ff0ba

pierwill force-pushed the untrack-localdefid-90317 branch from f00fd59 to e6ff0baCompare December 22, 2021 16:51

pierwill mentioned this pull request Dec 22, 2021
[test] Remove ordering traits from HirId#92199
Closed

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 Dec 22, 2021

pierwill mentioned this pull request Dec 22, 2021
[WIP] Remove ordering traits from HirId#92202
Closed

This was referenced Dec 23, 2021
Store hir_id_to_def_id in OwnerNodes. #91112
Closed
Reduce use of LocalDefId <-> HirId maps #90146
Merged
Remove LocalDefId <-> HirId global maps #89278
Closed
Use DefPathHash instead of HirId to break inlining cycles. #85321
Merged

pierwill mentioned this pull request Jan 17, 2022
Remove some unused Ord derives based on Span#93018
Merged

cuviper mentioned this pull request Mar 1, 2022
Restore the local filter on mono item sorting #94505
Merged

Uh oh!

Uh oh!

Conversation

pierwill commented Oct 29, 2021• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rust-highfive commented Oct 29, 2021

Uh oh!

pierwill commented Oct 29, 2021

Uh oh!

This comment has been minimized.

cjgillot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

pierwill commented Oct 30, 2021

Uh oh!

pierwill commented Oct 30, 2021• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

cjgillot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

This comment has been minimized.

Uh oh!

pierwill commented Dec 13, 2021

Uh oh!

pierwill commented Dec 15, 2021

Uh oh!

matthiaskrgr commented Dec 16, 2021

Uh oh!

pierwill commented Dec 16, 2021 via email

Uh oh!

bjorn3 commented Dec 22, 2021

Uh oh!

bors commented Dec 22, 2021

Uh oh!

bors commented Dec 22, 2021

Uh oh!

bors commented Dec 22, 2021

Uh oh!

bors commented Dec 23, 2021

Uh oh!

rust-timer commented Dec 23, 2021

Uh oh!

pierwill commented Dec 23, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants

pierwill commented Oct 29, 2021•
edited
Loading

pierwill commented Oct 30, 2021•
edited
Loading