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

Use hash2 instead of deprecated hash #16761

Merged
merged 1 commit into from May 8, 2017

Conversation

@ghost
Copy link

commented May 8, 2017


  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #__ (github issue number if applicable).
  • There are tests for these changes OR
  • These changes do not require tests because _____

This change is Reviewable

@highfive

This comment has been minimized.

Copy link

commented May 8, 2017

Thanks for the pull request, and welcome! The Servo team is excited to review your changes, and you should hear from @nox (or someone else) soon.

@highfive

This comment has been minimized.

Copy link

commented May 8, 2017

Heads up! This PR modifies the following files:

  • @KiChjang: components/net/subresource_integrity.rs
@highfive

This comment has been minimized.

Copy link

commented May 8, 2017

warning Warning warning

  • These commits modify net code, but no tests are modified. Please consider adding a test!
- [ ] `./mach build -d` does not report any errors
- [ ] `./mach test-tidy` does not report any errors
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors

This comment has been minimized.

Copy link
@jdm

jdm May 8, 2017

Member

The template should not be pre-checked; you should be making those changes in the description of this pull request, instead.

@jdm

This comment has been minimized.

Copy link
Member

commented May 8, 2017

This looks good! Please squash your commits into one, and then we'll merge this!

@jdm

This comment has been minimized.

Copy link
Member

commented May 8, 2017

Unfortunately that appears to have multiplied the commits instead of squashing them ;) I recommend git reset --hard 4e390e2630f244e77032ded404ca885c3e3ed8a7 && git cherry-pick 021f2ac.

@ghost

This comment has been minimized.

Copy link
Author

commented May 8, 2017

Should be fixed now. (I think)... Thanks! @jdm

@jdm

This comment has been minimized.

Copy link
Member

commented May 8, 2017

@Ksbugbee We're still back to two separate commits. If you run git rebase -i 0539302^ and mark "Squash and fixed comment" as "fixup", you should get the result we're looking for.

@jdm jdm removed the S-awaiting-review label May 8, 2017
Ksbugbee
Removed X's from PULL_REQUEST_TEMPLATE.md

Commented changes
@ghost

This comment has been minimized.

Copy link
Author

commented May 8, 2017

Ah much better! Thanks! @jdm

@jdm

This comment has been minimized.

Copy link
Member

commented May 8, 2017

@bors-servo: r+
Thanks!

@bors-servo

This comment has been minimized.

Copy link
Contributor

commented May 8, 2017

📌 Commit b4d894e has been approved by jdm

@bors-servo

This comment has been minimized.

Copy link
Contributor

commented May 8, 2017

⌛️ Testing commit b4d894e with merge 4e3544f...

bors-servo added a commit that referenced this pull request May 8, 2017
Use hash2 instead of deprecated hash

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- 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/16761)
<!-- Reviewable:end -->
@bors-servo

This comment has been minimized.

Copy link
Contributor

commented May 8, 2017

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2, windows-msvc-dev
Approved by: jdm
Pushing 4e3544f to master...

@bors-servo bors-servo merged commit b4d894e into servo:master May 8, 2017
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.