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.

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

Interner cleanups #93147

Merged
merged 2 commits into from
Jan 22, 2022
Merged

Interner cleanups #93147

merged 2 commits into from
Jan 22, 2022

Conversation

nnethercote
Copy link
Contributor

Improve some code that I have found confusing.

r? @lcnr

@nnethercote
Make stability interning follow the usual pattern.
c55819a
@nnethercote
Clarify some code relating to interning and types.
d46ed5d 
I have found this code very confusing at times. This commit clarifies
things.

In particular, the commit explains the requirements that the `Borrow`
impls put on the `Eq` and `Hash` impls, which are non-obvious. And it
puts the `Borrow` impls first, since they force `Eq` and `Hash` to have
particular forms.

The commit also notes `TyS`'s uniqueness requirements.
@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jan 21, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 21, 2022
@nnethercote nnethercote mentioned this pull request Jan 21, 2022
Merged
@lcnr
Copy link
Contributor

lcnr commented Jan 21, 2022

don't assume this to impact perf, but not 100% confident in using a rollup in case going to Interned here causes a slowdown.

@bors try @rust-timer queue

after that r=me

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jan 21, 2022
@bors
Copy link
Contributor

bors commented Jan 21, 2022

⌛ Trying commit d46ed5d with merge 07c20f3535c292ca5991882f170a5c28204334c2...

@bors
Copy link
Contributor

bors commented Jan 21, 2022

☀️ Try build successful - checks-actions
Build commit: 07c20f3535c292ca5991882f170a5c28204334c2 (07c20f3535c292ca5991882f170a5c28204334c2)

@rust-timer
Copy link
Collaborator

Queued 07c20f3535c292ca5991882f170a5c28204334c2 with parent 523be2e, future comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (07c20f3535c292ca5991882f170a5c28204334c2): comparison url.

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

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

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR led to changes in compiler perf.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf -perf-regression

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jan 21, 2022
@lcnr
Copy link
Contributor

lcnr commented Jan 21, 2022

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jan 21, 2022

📌 Commit d46ed5d has been approved by lcnr

@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 21, 2022
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 22, 2022
@matthiaskrgr
Rollup merge of rust-lang#93147 - nnethercote:interner-cleanups, r=lcnr
3fa1e2a 
Interner cleanups

Improve some code that I have found confusing.

r? `@lcnr`
@matthiaskrgr matthiaskrgr mentioned this pull request Jan 22, 2022
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 22, 2022
@matthiaskrgr
Rollup merge of rust-lang#93147 - nnethercote:interner-cleanups, r=lcnr
2aa8b90 
Interner cleanups

Improve some code that I have found confusing.

r? ``@lcnr``
@matthiaskrgr matthiaskrgr mentioned this pull request Jan 22, 2022
Closed
@matthiaskrgr matthiaskrgr mentioned this pull request Jan 22, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 22, 2022
@bors
Auto merge of rust-lang#93202 - matthiaskrgr:rollup-rki39xg, r=matthi…
bfe1564 
…askrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#85967 (add support for the l4-bender linker on the x86_64-unknown-l4re-uclibc tier 3 target)
 - rust-lang#92828 (Print a helpful message if unwinding aborts when it reaches a nounwind function)
 - rust-lang#93012 (Update pulldown-cmark version to fix markdown list issue)
 - rust-lang#93116 (Simplify use of `map_or`)
 - rust-lang#93132 (Increase the format version of rustdoc-json-types)
 - rust-lang#93147 (Interner cleanups)
 - rust-lang#93153 (Reject unsupported naked functions)
 - rust-lang#93170 (Add missing GUI test explanations)
 - rust-lang#93172 (rustdoc: remove dashed underline under main heading)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 5fd9c05 into rust-lang:master Jan 22, 2022
@rustbot rustbot added this to the 1.60.0 milestone Jan 22, 2022
@nnethercote nnethercote deleted the interner-cleanups branch January 23, 2022 01:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
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
1.60.0
Development

Successfully merging this pull request may close these issues.
6 participants
@nnethercote @lcnr @rust-timer @bors @rust-highfive @rustbot