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

style: Avoid hashing hashes. #18011

Merged
merged 1 commit into from Aug 8, 2017
Merged

style: Avoid hashing hashes. #18011

merged 1 commit into from Aug 8, 2017

Conversation

emilio
Copy link
Member

@emilio emilio commented Aug 8, 2017 •
edited by SimonSapin

These are the last instances I can find of us hashing the atoms hash.

This change is Reviewable

@highfive
Copy link

highfive commented Aug 8, 2017

Heads up! This PR modifies the following files:

@highfive
Copy link

highfive commented Aug 8, 2017

warning Warning warning

  • These commits modify style code, but no tests are modified. Please consider adding a test!

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Aug 8, 2017
@emilio
Copy link
Member Author

emilio commented Aug 8, 2017

r? @SimonSapin or @nox

@highfive highfive assigned SimonSapin and unassigned KiChjang Aug 8, 2017
@emilio emilio changed the title style: Avoid dumb hashing. style: Avoid hashing hashes. Aug 8, 2017
@emilio
Copy link
Member Author

emilio commented Aug 8, 2017 

12:57 <nox> emilio: s/dumb hashing/hashing hashes/
12:58 <emilio> nox: fair enough :)
12:58 <nox> emilio: r=me otherwise.
12:58 <emilio> nox: thanks!

@bors-servo r=nox

@bors-servo
Copy link
Contributor

📌 Commit 834db80 has been approved by nox

@highfive highfive assigned nox and unassigned SimonSapin Aug 8, 2017
@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Aug 8, 2017
@bors-servo
Copy link
Contributor

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

@highfive highfive added S-needs-rebase There are merge conflict errors. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Aug 8, 2017
@bors-servo
Copy link
Contributor

🔒 Merge conflict

@emilio
Copy link
Member Author

emilio commented Aug 8, 2017 •
edited

@bors-servo r=nox p=1

@bors-servo
Copy link
Contributor

💡 This pull request was already approved, no need to approve it again.

@bors-servo
Copy link
Contributor

📌 Commit 834db80 has been approved by nox

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-needs-rebase There are merge conflict errors. labels Aug 8, 2017
@highfive highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Aug 8, 2017
@emilio
Copy link
Member Author

emilio commented Aug 8, 2017

@bors-servo r-

  • Seems like bors caught the old commit?

@emilio
Copy link
Member Author

emilio commented Aug 8, 2017

@bors-servo r=nox

@bors-servo
Copy link
Contributor

📌 Commit 9fcaa0d has been approved by nox

@bors-servo
Copy link
Contributor

⌛ Testing commit 9fcaa0d with merge 730830e...

bors-servo pushed a commit that referenced this pull request Aug 8, 2017
Auto merge of #18011 - emilio:less-dumb-hash, r=nox
730830e 
style: Avoid hashing hashes.

These are the last instances I can find of us hashing the atoms hash.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18011)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

💔 Test failed - linux-rel-wpt

@highfive highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Aug 8, 2017
@highfive highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-tests-failed The changes caused existing tests to fail. labels Aug 8, 2017
@emilio
Copy link
Member Author

emilio commented Aug 8, 2017

@bors-servo r=nox

  • I removed an import during the rebase accidentally, sigh.

@bors-servo
Copy link
Contributor

📌 Commit b90e51c has been approved by nox

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Aug 8, 2017
bors-servo pushed a commit that referenced this pull request Aug 8, 2017
Auto merge of #18011 - emilio:less-dumb-hash, r=nox
d55eece 
style: Avoid hashing hashes.

These are the last instances I can find of us hashing the atoms hash.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18011)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

⌛ Testing commit b90e51c with merge d55eece...

@bors-servo
Copy link
Contributor

💔 Test failed - linux-rel-css

@highfive highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Aug 8, 2017
@emilio
style: Avoid hashing hashes.
de58c08 
These are the last instances I can find of us hashing the atoms hash.
@highfive highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-tests-failed The changes caused existing tests to fail. labels Aug 8, 2017
@emilio
Copy link
Member Author

emilio commented Aug 8, 2017

Sigh, now for real...

@bors-servo r=nox

@bors-servo
Copy link
Contributor

📌 Commit de58c08 has been approved by nox

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Aug 8, 2017
@bors-servo
Copy link
Contributor

⌛ Testing commit de58c08 with merge dec4ba8...

bors-servo pushed a commit that referenced this pull request Aug 8, 2017
Auto merge of #18011 - emilio:less-dumb-hash, r=nox
dec4ba8 
style: Avoid hashing hashes.

These are the last instances I can find of us hashing the atoms hash.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18011)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev
Approved by: nox
Pushing dec4ba8 to master...

@bors-servo bors-servo merged commit de58c08 into servo:master Aug 8, 2017
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Aug 8, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nox nox

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@emilio @highfive @bors-servo @nox @SimonSapin @KiChjang