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

Use derive macro for HashStable #56864

Merged
merged 3 commits into from
Mar 13, 2019
Merged

Use derive macro for HashStable #56864

merged 3 commits into from
Mar 13, 2019

Conversation

Zoxc
Copy link
Contributor

@Zoxc Zoxc commented Dec 15, 2018

Blocked on #56795

@rust-highfive
Copy link
Collaborator

r? @matthewjasper

(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 Dec 15, 2018
@rust-highfive

This comment has been minimized.

Sign in to view
@Zoxc Zoxc force-pushed the stable-hash-macro branch 2 times, most recently from fa13d01 to 8067955 Compare December 16, 2018 04:58
@Zoxc
Copy link
Contributor Author

Zoxc commented Dec 16, 2018

r? @michaelwoerister

@michaelwoerister
Copy link
Member

Looks promising!

@bors

This comment has been minimized.

Sign in to view
@Zoxc Zoxc force-pushed the stable-hash-macro branch from 8067955 to 4482fd6 Compare December 21, 2018 09:35
@rust-highfive

This comment has been minimized.

Sign in to view
@rust-highfive

This comment has been minimized.

Sign in to view
@bors

This comment has been minimized.

Sign in to view
@Zoxc Zoxc mentioned this pull request Dec 28, 2018
Closed
bors added a commit that referenced this pull request Jan 11, 2019
@bors
Auto merge of #57173 - Zoxc:hir-lifetime, r=<try>
6e789d4 
[WIP] Allocate HIR on an arena

Blocked on #56864
@Dylan-DPC-zz Dylan-DPC-zz added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 21, 2019
@Zoxc Zoxc mentioned this pull request Jan 30, 2019
Merged
@Zoxc Zoxc force-pushed the stable-hash-macro branch from 436166c to 87dca52 Compare February 16, 2019 09:23
@rust-highfive

This comment has been minimized.

Sign in to view
@Zoxc Zoxc force-pushed the stable-hash-macro branch from 87dca52 to 4f03dfb Compare February 16, 2019 13:29
@bors

This comment has been minimized.

Sign in to view
bors added a commit that referenced this pull request Mar 8, 2019
@bors
Auto merge of #58013 - Zoxc:stable-hash-macro-simple, r=oli-obk
0547ceb 
Create a derive macro for HashStable and allow proc macros in rustc

A combination of #56864 and #56795. There were complications with using `serde_derive` as rustc doesn't know which crate to use for the host when there is a serde_derive in the sysroot and cargo passes another on the command line built from crates.io.

r? @eddyb (for proc macro changes) @alexcrichton (for rustbuild changes) @michaelwoerister (for the macro itself)
@Zoxc Zoxc force-pushed the stable-hash-macro branch from 4f03dfb to 309415c Compare March 8, 2019 19:43
michaelwoerister
michaelwoerister reviewed Mar 11, 2019
View reviewed changes
src/librustc/hir/mod.rs
pub struct EnumDef {
pub variants: HirVec<Variant>,
}

#[derive(Clone, RustcEncodable, RustcDecodable, Debug)]
#[derive(Clone, RustcEncodable, RustcDecodable, Debug, HashStable)]
pub struct VariantKind {
pub ident: Ident,
Copy link
Member

Choose a reason for hiding this comment

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

This seems to be missing a projection attribute.

michaelwoerister
michaelwoerister reviewed Mar 11, 2019
View reviewed changes
src/librustc/hir/mod.rs
pub enum AssociatedItemKind {
Const,
Method { has_self: bool },
Type,
Existential,
}

#[derive(Clone, RustcEncodable, RustcDecodable, Debug)]
#[derive(Clone, RustcEncodable, RustcDecodable, Debug, HashStable)]
pub struct ForeignItem {
pub ident: Ident,
Copy link
Member

Choose a reason for hiding this comment

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

This too.

@michaelwoerister
Copy link
Member

Beautiful, thanks @Zoxc! r=me with the two nits addressed.

@rust-lang/compiler, please marvel at the diff stats of this PR :)

@Zoxc Zoxc force-pushed the stable-hash-macro branch from 681b8dc to bc3a84a Compare March 12, 2019 23:20
@Zoxc
Copy link
Contributor Author

Zoxc commented Mar 13, 2019

@bors r=michaelwoerister

@bors
Copy link
Contributor

bors commented Mar 13, 2019

📌 Commit bc3a84a 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 Mar 13, 2019
@bors
Copy link
Contributor

bors commented Mar 13, 2019

⌛ Testing commit bc3a84a with merge 09cf073a10bb65a550dd3082e2a7511a7d43dd8f...

@bors
Copy link
Contributor

bors commented Mar 13, 2019

💥 Test timed out

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 13, 2019
@ljedrz
Copy link
Contributor

ljedrz commented Mar 13, 2019

@bors retry

@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 13, 2019
@bors
Copy link
Contributor

bors commented Mar 13, 2019

⌛ Testing commit bc3a84a with merge cf6d881...

bors added a commit that referenced this pull request Mar 13, 2019
@bors
Auto merge of #56864 - Zoxc:stable-hash-macro, r=michaelwoerister
cf6d881 
Use derive macro for HashStable

Blocked on #56795
@ljedrz ljedrz mentioned this pull request Mar 13, 2019
Merged
@bors
Copy link
Contributor

bors commented Mar 13, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: michaelwoerister
Pushing cf6d881 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 13, 2019
@bors bors merged commit bc3a84a into rust-lang:master Mar 13, 2019
This was referenced Mar 13, 2019
Merged
Merged
Closed
@Zoxc Zoxc deleted the stable-hash-macro branch March 14, 2019 01:59
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 18, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bjorn3 bjorn3 bjorn3 left review comments

@michaelwoerister michaelwoerister michaelwoerister left review comments

Assignees

@michaelwoerister michaelwoerister

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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@Zoxc @rust-highfive @michaelwoerister @bors @ljedrz @bjorn3 @Dylan-DPC-zz @matthewjasper