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

incr.comp.: Minor refactoring and update to struct ICH test case #36831

Merged
merged 2 commits into from
Oct 13, 2016
Merged

incr.comp.: Minor refactoring and update to struct ICH test case #36831

merged 2 commits into from
Oct 13, 2016

Conversation

michaelwoerister
Copy link
Member

Mark-Simulacrum
Mark-Simulacrum reviewed Sep 29, 2016
View reviewed changes
src/librustc_incremental/calculate_svh/hasher.rs
}

impl IchHasher {

Copy link
Member

Choose a reason for hiding this comment

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

Extra newline?

Copy link
Member Author

Choose a reason for hiding this comment

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

Maybe? :) I sometimes like to have the extra space there because it makes things easier to read.

Copy link
Member

Choose a reason for hiding this comment

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

Most of the other impls in this file (and across the compiler) don't have it. "Ask the style team." (not that there are concrete answers there at this point either).

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, I'll change it.

@bors
Copy link
Contributor

bors commented Oct 3, 2016

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

@michaelwoerister
Copy link
Member Author

Rebased.

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Oct 12, 2016

📌 Commit 954d89b has been approved by nikomatsakis

alexcrichton added a commit to alexcrichton/rust that referenced this pull request Oct 12, 2016
@alexcrichton
Rollup merge of rust-lang#36831 - michaelwoerister:ich-updates, r=nik…
091b547 
…omatsakis

incr.comp.: Minor refactoring and update to struct ICH test case

r? @nikomatsakis
@alexcrichton alexcrichton mentioned this pull request Oct 12, 2016
Merged
bors added a commit that referenced this pull request Oct 12, 2016
@bors
Auto merge of #37118 - alexcrichton:rollup, r=alexcrichton
d34318d 
Rollup of 17 pull requests

- Successful merges: #36762, #36831, #36973, #36991, #36995, #37023, #37049, #37050, #37056, #37064, #37066, #37067, #37084, #37089, #37091, #37092, #37110
- Failed merges:
@bors bors merged commit 954d89b into rust-lang:master Oct 13, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mark-Simulacrum Mark-Simulacrum Mark-Simulacrum left review comments

Assignees

@nikomatsakis nikomatsakis

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@michaelwoerister @bors @nikomatsakis @Mark-Simulacrum