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

Some preparations for directly computing the ICH of crate-metadata. #40678

Merged
merged 7 commits into from
Mar 23, 2017

Conversation

michaelwoerister
Copy link
Member

This PR contains some small fixes in preparation for direct metadata hashing. It mostly just moves stuff into places where it will be needed (making the module structure slightly cleaner along the way) and it fixes some omissions in the MIR region eraser.

r? @nikomatsakis

}
ty::ReErased |
ty::ReStatic |
ty::ReEmpty => {}
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit: can you add a blank line in the {} block? This formatting makes it hard to see that the arms are a distinct group from the line below.

Rvalue::Ref(ref mut r, _, _) => {
*r = self.tcx.mk_region(ReErased);
}
_ => {
Copy link
Contributor

Choose a reason for hiding this comment

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

I feel like this is a classic case where it'd be good to enumerate the Rvalue variants (so that if a new variant is added, or a variant changes, we are likely to notice this case)

@nikomatsakis
Copy link
Contributor

r=me if the match is made exhaustive

@michaelwoerister
Copy link
Member Author

@bors r=nikomatsakis

@bors
Copy link
Contributor

bors commented Mar 21, 2017

📌 Commit 00fed35 has been approved by nikomatsakis

@bors
Copy link
Contributor

bors commented Mar 21, 2017

🔒 Merge conflict

@bstrie
Copy link
Contributor

bstrie commented Mar 21, 2017

There's a submodule conflict causing some mass PR invalidations, but rebasing reveals many other conflicts which I don't feel comfortable fixing myself (I already feel dirty enough rebasing commits in other people's repos...).

@bstrie
Copy link
Contributor

bstrie commented Mar 21, 2017

@bors r=nikomatsakis

@bors
Copy link
Contributor

bors commented Mar 21, 2017

📌 Commit c9a61b1 has been approved by nikomatsakis

@michaelwoerister
Copy link
Member Author

@bors r=nikomatsakis

Rebased

@bors
Copy link
Contributor

bors commented Mar 22, 2017

📌 Commit 45deab4 has been approved by nikomatsakis

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Mar 23, 2017
…tsakis

Some preparations for directly computing the ICH of crate-metadata.

This PR contains some small fixes in preparation for direct metadata hashing. It mostly just moves stuff into places where it will be needed (making the module structure slightly cleaner along the way) and it fixes some omissions in the MIR region eraser.

r? @nikomatsakis
bors added a commit that referenced this pull request Mar 23, 2017
Rollup of 6 pull requests

- Successful merges: #39891, #40518, #40542, #40617, #40678, #40696
- Failed merges:
@bors bors merged commit 45deab4 into rust-lang:master Mar 23, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants