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

Cleanup constellation after nll #22376

Merged
merged 1 commit into from Dec 8, 2018
Merged

Cleanup constellation after nll #22376

merged 1 commit into from Dec 8, 2018

Conversation

@cbrewster
Copy link
Member

cbrewster commented Dec 6, 2018 •
edited by SimonSapin

This cleans up a couple cases where we had to add extra scopes to appease the borrowck, now that nll has landed, this cleans these up.

  • ./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 cleanup

This change is Reviewable
@cbrewster
Cleanup constellation after nll
Loading status checks…
aecb48d
@highfive
Copy link

highfive commented Dec 6, 2018

Heads up! This PR modifies the following files:

  • @asajeffrey: components/constellation/constellation.rs
  • @paulrouget: components/constellation/constellation.rs
@jdm
Copy link
Member

jdm commented Dec 6, 2018

@bors-servo r+
Thanks for cleaning this up!
@bors-servo
Copy link
Contributor

bors-servo commented Dec 6, 2018

📌 Commit aecb48d has been approved by jdm
@highfive highfive assigned jdm and unassigned emilio Dec 6, 2018
@bors-servo
Copy link
Contributor

bors-servo commented Dec 6, 2018

⌛ Testing commit aecb48d with merge 920056c...
bors-servo added a commit that referenced this pull request Dec 6, 2018
@bors-servo
Auto merge of #22376 - cbrewster:constellation_nll_cleanup, r=jdm
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…
920056c 
Cleanup constellation after nll

<!-- Please describe your changes on the following line: -->
This cleans up a couple cases where we had to add extra scopes to appease the borrowck, now that nll has landed, this cleans these up.

---
<!-- 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 cleanup

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

bors-servo commented Dec 6, 2018

💔 Test failed - mac-rel-css1
@jdm
Copy link
Member

jdm commented Dec 6, 2018

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

bors-servo commented Dec 7, 2018

⌛ Testing commit aecb48d with merge 40624cf...
bors-servo added a commit that referenced this pull request Dec 7, 2018
@bors-servo
Auto merge of #22376 - cbrewster:constellation_nll_cleanup, r=jdm
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…
40624cf 
Cleanup constellation after nll

<!-- Please describe your changes on the following line: -->
This cleans up a couple cases where we had to add extra scopes to appease the borrowck, now that nll has landed, this cleans these up.

---
<!-- 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 cleanup

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

bors-servo commented Dec 7, 2018

💔 Test failed - mac-rel-css1
@CYBAI
Copy link
Collaborator

CYBAI commented Dec 7, 2018

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

bors-servo commented Dec 7, 2018

⚡ Previous build results for android, android-mac, android-x86, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, magicleap, status-taskcluster, windows-msvc-dev are reusable. Rebuilding only mac-rel-css1...
@bors-servo
Copy link
Contributor

bors-servo commented Dec 7, 2018

💔 Test failed - mac-rel-css1
@CYBAI
Copy link
Collaborator

CYBAI commented Dec 7, 2018

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

bors-servo commented Dec 7, 2018

⚡ Previous build results for android, android-mac, android-x86, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, magicleap, status-taskcluster, windows-msvc-dev are reusable. Rebuilding only mac-rel-css1...
@bors-servo
Copy link
Contributor

bors-servo commented Dec 7, 2018

💔 Test failed - mac-rel-css1
@jdm
Copy link
Member

jdm commented Dec 7, 2018

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

bors-servo commented Dec 7, 2018

⚡ Previous build results for android, android-mac, android-x86, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, magicleap, status-taskcluster, windows-msvc-dev are reusable. Rebuilding only mac-rel-css1...
@bors-servo
Copy link
Contributor

bors-servo commented Dec 7, 2018

💔 Test failed - mac-rel-css1
@CYBAI
Copy link
Collaborator

CYBAI commented Dec 8, 2018

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

bors-servo commented Dec 8, 2018

⚡ Previous build results for android, android-mac, android-x86, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, magicleap, status-taskcluster, windows-msvc-dev are reusable. Rebuilding only mac-rel-css1...
@bors-servo
Copy link
Contributor

bors-servo commented Dec 8, 2018

💔 Test failed - mac-rel-css1
@CYBAI
Copy link
Collaborator

CYBAI commented Dec 8, 2018 •
edited

hmm.. it keeps TIMEOUT or NOTRUN on servo-mac8 on various of tests 🤔

{"status": "TIMEOUT", "group": "default", "message": "Test timed out", "stack": null, "subtest": "cross-origin redirect 308 in follow redirect and no-cors mode", "test": "/fetch/api/redirect/redirect-mode.any.html", "line": 54000, "action": "test_result", "expected": "PASS"}
{"status": "TIMEOUT", "group": "default", "message": null, "stack": null, "subtest": null, "test": "/fetch/api/redirect/redirect-mode.any.html", "line": 54001, "action": "test_result", "expected": "OK"}
{"status": "NOTRUN", "group": "default", "message": null, "stack": null, "subtest": "Overall test", "test": "/_webgl/conformance/context/context-release-with-workers.html", "line": 61818, "action": "test_result", "expected": "PASS"}
{"status": "TIMEOUT", "group": "default", "message": null, "stack": null, "subtest": null, "test": "/_webgl/conformance/context/context-release-with-workers.html", "line": 61876, "action": "test_result", "expected": "OK"}
{"status": "NOTRUN", "group": "default", "message": null, "stack": null, "subtest": "Overall test", "test": "/_webgl/conformance/glsl/constructors/glsl-construct-bvec2.html", "line": 61906, "action": "test_result", "expected": "PASS"}
{"status": "TIMEOUT", "group": "default", "message": null, "stack": null, "subtest": null, "test": "/_webgl/conformance/glsl/constructors/glsl-construct-bvec2.html", "line": 61951, "action": "test_result", "expected": "OK"}
{"status": "TIMEOUT", "group": "default", "message": null, "stack": null, "subtest": null, "test": "/_mozilla/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html", "line": 61965, "action": "test_result", "expected": "OK"}
{"status": "TIMEOUT", "group": "default", "message": null, "stack": null, "subtest": null, "test": "/url/a-element-origin.html", "line": 61973, "action": "test_result", "expected": "OK"}
@CYBAI
Copy link
Collaborator

CYBAI commented Dec 8, 2018

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

bors-servo commented Dec 8, 2018

⌛ Testing commit aecb48d with merge 5346f74...
bors-servo added a commit that referenced this pull request Dec 8, 2018
@bors-servo
Auto merge of #22376 - cbrewster:constellation_nll_cleanup, r=jdm
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…
5346f74 
Cleanup constellation after nll

<!-- Please describe your changes on the following line: -->
This cleans up a couple cases where we had to add extra scopes to appease the borrowck, now that nll has landed, this cleans these up.

---
<!-- 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 cleanup

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

bors-servo commented Dec 8, 2018

☀️ Test successful - android, android-mac, android-x86, 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, magicleap, status-taskcluster, windows-msvc-dev
Approved by: jdm
Pushing 5346f74 to master...
@bors-servo bors-servo merged commit aecb48d into servo:master Dec 8, 2018
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
Reviewers
No reviews
Assignees

@jdm jdm

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
@cbrewster @highfive @jdm @bors-servo @CYBAI @emilio
You can’t perform that action at this time.