Skip to content

/ servo

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

[DO NOT MERGE] Update WR (transaction API change) #20920

Closed
wants to merge 1 commit into from
Closed

[DO NOT MERGE] Update WR (transaction API change) #20920

wants to merge 1 commit into from
+154 −196

Conversation

@mrobinson
Copy link
Member

mrobinson commented Jun 5, 2018 •
edited by SimonSapin

  • ./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 they should not change functionality.

This change is Reviewable
@gw3583 @mrobinson
Update WR (transaction API change)
Loading status checks…
2de00f1
@highfive
Copy link

highfive commented Jun 5, 2018

Heads up! This PR modifies the following files:

  • @KiChjang: components/net/image_cache.rs
  • @emilio: components/layout/display_list/items.rs, components/layout/display_list/webrender_helpers.rs, components/layout/display_list/builder.rs
@mrobinson
Copy link
Member Author

mrobinson commented Jun 5, 2018

@bors-servo try
@bors-servo
Copy link
Contributor

bors-servo commented Jun 5, 2018

⌛ Trying commit 2de00f1 with merge af4b4f1...
bors-servo added a commit that referenced this pull request Jun 5, 2018
@bors-servo
Auto merge of #20920 - mrobinson:wr-update, r=<try>
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
af4b4f1 
[DO NOT MERGE] Update WR (transaction API change)

<!-- 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
- [x] These changes do not require tests because they should not change functionality.

<!-- 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. -->
@bors-servo
Copy link
Contributor

bors-servo commented Jun 5, 2018

💔 Test failed - mac-rel-css1
@mrobinson
Copy link
Member Author

mrobinson commented Jun 5, 2018 •
edited

@bors-servo retry
@bors-servo
Copy link
Contributor

bors-servo commented Jun 5, 2018

⌛ Trying commit 2de00f1 with merge 3b51a0d...
bors-servo added a commit that referenced this pull request Jun 5, 2018
@bors-servo
Auto merge of #20920 - mrobinson:wr-update, r=<try>
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
3b51a0d 
[DO NOT MERGE] Update WR (transaction API change)

<!-- 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
- [x] These changes do not require tests because they should not change functionality.

<!-- 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/20920)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jun 5, 2018

⌛ Trying commit 2de00f1 with merge c9c25c7...
bors-servo added a commit that referenced this pull request Jun 5, 2018
@bors-servo
Auto merge of #20920 - mrobinson:wr-update, r=<try>
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
c9c25c7 
[DO NOT MERGE] Update WR (transaction API change)

<!-- 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
- [x] These changes do not require tests because they should not change functionality.

<!-- 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/20920)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jun 6, 2018

💥 Test timed out
@bors-servo
Copy link
Contributor

bors-servo commented Jun 6, 2018

☔ The latest upstream changes (presumably #20935) made this pull request unmergeable. Please resolve the merge conflicts.
@mrobinson mrobinson closed this Jun 7, 2018
@mrobinson mrobinson deleted the mrobinson:wr-update branch Jun 7, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@glennw glennw

Labels
S-awaiting-review S-needs-rebase S-tests-failed
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@mrobinson @highfive @bors-servo @glennw @gw3583
You can’t perform that action at this time.