Add `HashStable_NoContext` to simplify `HashStable` implementations in `rustc_type_ir` #117580

compiler-errors · 2023-11-04T17:10:02Z

adds derive(HashStable_NoContext) which is a derived HashStable implementation that has no HashStableContext bound, and which adds where bounds for HashStable based off of fields and not generics.

This means we can derive(HashStable_NoContext) in more places in rustc_type_ir rather than having to hand-roll implementations.

rustbot · 2023-11-04T17:10:11Z

r? @wesleywiser

(rustbot has picked a reviewer for you, use r? to override)

cjgillot · 2023-11-04T18:51:40Z

Should we use this implementation everywhere as HashStable_Generic? Or does this break stuff?

compiler-errors · 2023-11-04T18:55:39Z

@cjgillot: I tried it, and it breaks stuff, I think where generating where clauses based on fields may lead to coinductive cycles. I could come up with an example if you're curious, but I think it's already explored generally in Niko's blog post about perfect derive.

bors · 2023-11-06T13:03:09Z

☔ The latest upstream changes (presumably #117578) made this pull request unmergeable. Please resolve the merge conflicts.

compiler-errors · 2023-11-09T20:03:46Z

r? @jackh726

bors · 2023-11-13T18:19:05Z

☔ The latest upstream changes (presumably #117876) made this pull request unmergeable. Please resolve the merge conflicts.

jackh726 · 2023-11-13T19:01:32Z

I'll get to this soon (and the other)

bors · 2023-11-14T13:59:18Z

☔ The latest upstream changes (presumably #117731) made this pull request unmergeable. Please resolve the merge conflicts.

jackh726 · 2023-11-19T22:50:16Z

compiler/rustc_macros/src/hash_stable.rs

+    let body = s.each(|bi| {
+        let attrs = parse_attributes(bi.ast());
+        if attrs.ignore {
+            quote! {}
+        } else if let Some(project) = attrs.project {
+            quote! {
+                (&#bi.#project).hash_stable(__hcx, __hasher);
+            }
+        } else {
+            quote! {
+                #bi.hash_stable(__hcx, __hasher);
+            }
+        }
+    });
+
+    let discriminant = match s.ast().data {
+        syn::Data::Enum(_) => quote! {
+            ::std::mem::discriminant(self).hash_stable(__hcx, __hasher);
+        },
+        syn::Data::Struct(_) => quote! {},
+        syn::Data::Union(_) => panic!("cannot derive on union"),
+    };


Can these use the functions below? I don't see how they're different?

jackh726 · 2023-11-19T22:52:21Z

compiler/rustc_macros/src/hash_stable.rs

    )
 }

+pub(crate) fn hash_stable_no_context_derive(


Can we have an inner function with a bool to indicate whether to add the where clause or not, then just delegate these two derives to that?

Cool, r=me with that change.

compiler-errors · 2023-11-20T17:26:37Z

@bors r=jackh726

Rebased, unified all the HashStable implementations, and made sure it continues to build with/without feature = "nightly".

bors · 2023-11-20T17:26:40Z

📌 Commit efee297 has been approved by jackh726

It is now in the queue for this repository.

bors · 2023-11-21T04:30:58Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout hash-stable-simplify-rustc_type_ir (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self hash-stable-simplify-rustc_type_ir --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Auto-merging compiler/rustc_type_ir/src/ty_kind.rs
CONFLICT (content): Merge conflict in compiler/rustc_type_ir/src/ty_kind.rs
Auto-merging compiler/rustc_type_ir/src/const_kind.rs
CONFLICT (content): Merge conflict in compiler/rustc_type_ir/src/const_kind.rs
Automatic merge failed; fix conflicts and then commit the result.

bors · 2023-11-21T04:46:46Z

☔ The latest upstream changes (presumably #118107) made this pull request unmergeable. Please resolve the merge conflicts.

…stc_type_ir

compiler-errors · 2023-11-21T05:54:32Z

@bors r=jackh726

bors · 2023-11-21T05:54:35Z

📌 Commit c9143ea has been approved by jackh726

It is now in the queue for this repository.

bors · 2023-11-21T11:13:18Z

⌛ Testing commit c9143ea with merge 7bd385d...

bors · 2023-11-21T13:08:40Z

☀️ Test successful - checks-actions
Approved by: jackh726
Pushing 7bd385d to master...

…, r=jackh726 Uplift `CanonicalVarInfo` and friends into `rustc_type_ir` Depends on rust-lang#117580 and rust-lang#117578 Uplift `CanonicalVarInfo` and friends into `rustc_type_ir` so they can be consumed by an interner-agnostic `Canonicalizer` implementation for the new trait solver ❤️ r? `@ghost`

rust-timer · 2023-11-22T06:18:59Z

Finished benchmarking commit (7bd385d): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.9%	[-3.7%, -2.1%]	2
All ❌✅ (primary)	-	-	0

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 674.399s -> 674.8s (0.06%)
Artifact size: 313.75 MiB -> 313.76 MiB (0.00%)

rustbot assigned wesleywiser Nov 4, 2023

compiler-errors mentioned this pull request Nov 4, 2023

Uplift CanonicalVarInfo and friends into rustc_type_ir #117582

Merged

rust-cloud-vms bot force-pushed the hash-stable-simplify-rustc_type_ir branch from b94f779 to 740635f Compare November 6, 2023 23:50

rustbot assigned jackh726 and unassigned wesleywiser Nov 9, 2023

compiler-errors force-pushed the hash-stable-simplify-rustc_type_ir branch from 740635f to 003e1ee Compare November 13, 2023 18:49

This comment has been minimized.

Sign in to view

compiler-errors force-pushed the hash-stable-simplify-rustc_type_ir branch from 003e1ee to 0cfdedb Compare November 13, 2023 18:54

compiler-errors force-pushed the hash-stable-simplify-rustc_type_ir branch from 0cfdedb to 543d9d3 Compare November 17, 2023 17:15

jackh726 requested changes Nov 19, 2023

View reviewed changes

rustbot 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 Nov 19, 2023

compiler-errors force-pushed the hash-stable-simplify-rustc_type_ir branch 2 times, most recently from b9eab51 to efee297 Compare November 20, 2023 17:26

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 20, 2023

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 21, 2023

compiler-errors added 2 commits November 21, 2023 05:49

Add HashStable_NoContext to simplify HashStable implementations in ru…

426bc70

…stc_type_ir

Unify HashStable implementations

c9143ea

compiler-errors force-pushed the hash-stable-simplify-rustc_type_ir branch from efee297 to c9143ea Compare November 21, 2023 05:53

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 21, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 21, 2023

bors merged commit 7bd385d into rust-lang:master Nov 21, 2023

rustbot added this to the 1.76.0 milestone Nov 21, 2023

This was referenced Nov 21, 2023

Remove PredicateKind::ClosureKind #118120

Merged

Make some newtype_index! derived impls opt-in instead of opt-out #118125

Merged

jackh726 mentioned this pull request Nov 30, 2023

Tracking issue for shared type library rust-lang/types-team#16

Open

26 tasks

Add HashStable_NoContext to simplify HashStable implementations in rustc_type_ir #117580

Add HashStable_NoContext to simplify HashStable implementations in rustc_type_ir #117580

Uh oh!

Conversation

compiler-errors commented Nov 4, 2023

Uh oh!

rustbot commented Nov 4, 2023

Uh oh!

cjgillot commented Nov 4, 2023

Uh oh!

compiler-errors commented Nov 4, 2023

Uh oh!

bors commented Nov 6, 2023

Uh oh!

compiler-errors commented Nov 9, 2023

Uh oh!

bors commented Nov 13, 2023

Uh oh!

This comment has been minimized.

jackh726 commented Nov 13, 2023

Uh oh!

bors commented Nov 14, 2023

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

compiler-errors commented Nov 20, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bors commented Nov 20, 2023

Uh oh!

bors commented Nov 21, 2023

Uh oh!

bors commented Nov 21, 2023

Uh oh!

compiler-errors commented Nov 21, 2023

Uh oh!

bors commented Nov 21, 2023

Uh oh!

bors commented Nov 21, 2023

Uh oh!

bors commented Nov 21, 2023

Uh oh!

rust-timer commented Nov 22, 2023

Overall result: no relevant changes - no action needed

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Add `HashStable_NoContext` to simplify `HashStable` implementations in `rustc_type_ir` #117580

Add `HashStable_NoContext` to simplify `HashStable` implementations in `rustc_type_ir` #117580

compiler-errors commented Nov 20, 2023 •

edited

Loading