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

Replace use of callbacks in webxr by channels #23848

Merged
merged 1 commit into from Jul 27, 2019

Conversation

@asajeffrey
Copy link
Member

asajeffrey commented Jul 25, 2019

Use senders rather than callbacks in webxr.


  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes do not require tests because it's an internal change

This change is Reviewable

@highfive
Copy link

highfive commented Jul 25, 2019

Heads up! This PR modifies the following files:

  • @KiChjang: components/net/tests/main.rs, components/script/dom/xrtest.rs, components/script/dom/webglrenderingcontext.rs, components/script/dom/xrsession.rs, components/script/dom/xr.rs
@asajeffrey
Copy link
Member Author

asajeffrey commented Jul 25, 2019

Depends on #23847 and servo/webxr#29

@asajeffrey
Copy link
Member Author

asajeffrey commented Jul 25, 2019

@highfive highfive assigned Manishearth and unassigned avadacatavra Jul 25, 2019
@asajeffrey asajeffrey changed the title Webxr moar channels Replace use of callbacks in webxr by channels Jul 25, 2019
@bors-servo
Copy link
Contributor

bors-servo commented Jul 25, 2019

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

asajeffrey added a commit to asajeffrey/servo that referenced this pull request Jul 25, 2019
@asajeffrey asajeffrey force-pushed the asajeffrey:webxr-moar-channels branch 2 times, most recently from 9efcc74 to 1cbf512 Jul 25, 2019
@asajeffrey asajeffrey marked this pull request as ready for review Jul 25, 2019
@asajeffrey
Copy link
Member Author

asajeffrey commented Jul 25, 2019

@bors-servo r=Manishearth

@bors-servo
Copy link
Contributor

bors-servo commented Jul 25, 2019

📌 Commit 1cbf512 has been approved by Manishearth

@bors-servo
Copy link
Contributor

bors-servo commented Jul 25, 2019

Testing commit 1cbf512 with merge 913205a...

bors-servo added a commit that referenced this pull request Jul 25, 2019
Replace use of callbacks in webxr by channels

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

Use senders rather than callbacks in webxr.

---
<!-- 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
- [X] These changes do not require tests because it's an internal change

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

bors-servo commented Jul 26, 2019

💔 Test failed - linux-rel-css

@jdm
Copy link
Member

jdm commented Jul 26, 2019

./components/canvas/Cargo.toml:39: no newline at EOF
@asajeffrey asajeffrey force-pushed the asajeffrey:webxr-moar-channels branch from 1cbf512 to 65a26ad Jul 26, 2019
bors-servo added a commit that referenced this pull request Jul 27, 2019
Replace use of callbacks in webxr by channels

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

Use senders rather than callbacks in webxr.

---
<!-- 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
- [X] These changes do not require tests because it's an internal change

<!-- 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/23848)
<!-- Reviewable:end -->
@CYBAI
Copy link
Collaborator

CYBAI commented Jul 27, 2019

bors-servo retry

Note that it's #23290 intermittent failure.

@bors-servo
Copy link
Contributor

bors-servo commented Jul 27, 2019

💔 Test failed - linux-rel-css

@CYBAI
Copy link
Collaborator

CYBAI commented Jul 27, 2019

@bors-servo
Copy link
Contributor

bors-servo commented Jul 27, 2019

Testing commit 133a17e with merge 6db5fc6...

bors-servo added a commit that referenced this pull request Jul 27, 2019
Replace use of callbacks in webxr by channels

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

Use senders rather than callbacks in webxr.

---
<!-- 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
- [X] These changes do not require tests because it's an internal change

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

bors-servo commented Jul 27, 2019

💔 Test failed - linux-rel-css

@jdm
Copy link
Member

jdm commented Jul 27, 2019

@bors-servo retry

@bors-servo
Copy link
Contributor

bors-servo commented Jul 27, 2019

💣 Failed to start rebuilding: Unknown error

@bors-servo
Copy link
Contributor

bors-servo commented Jul 27, 2019

Testing commit 133a17e with merge dcc5ae9...

bors-servo added a commit that referenced this pull request Jul 27, 2019
Replace use of callbacks in webxr by channels

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

Use senders rather than callbacks in webxr.

---
<!-- 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
- [X] These changes do not require tests because it's an internal change

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

bors-servo commented Jul 27, 2019

☀️ Test successful - linux-rel-css, linux-rel-wpt, status-taskcluster
Approved by: Manishearth
Pushing dcc5ae9 to master...

@bors-servo bors-servo merged commit 133a17e into servo:master Jul 27, 2019
3 checks passed
3 checks passed
Taskcluster (pull_request) TaskGroup: success
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
SimonSapin added a commit that referenced this pull request Jul 28, 2019
This backs out commit 133a17e / PR #23848
because it relies on a git branch that was apparently removed:

```
$ cargo fetch
    Updating git repository `https://github.com/asajeffrey/webxr`
error: failed to resolve patches for `https://github.com/servo/webxr`

Caused by:
  failed to load source for a dependency on `webxr`

Caused by:
  Unable to update https://github.com/asajeffrey/webxr?branch=optional-glsync#da820a3a

Caused by:
  revspec 'da820a3ab266fce07c9a8abee3e6e9231cb93ec5' not found; class=Reference (4); code=NotFound (-3)
```
bors-servo added a commit that referenced this pull request Jul 28, 2019
Revert "Replace use of callbacks in webxr by channels"

This backs out commit 133a17e / PR #23848 because it relies on a git branch that was apparently removed:

```
$ cargo fetch
    Updating git repository `https://github.com/asajeffrey/webxr`
error: failed to resolve patches for `https://github.com/servo/webxr`

Caused by:
  failed to load source for a dependency on `webxr`

Caused by:
  Unable to update https://github.com/asajeffrey/webxr?branch=optional-glsync#da820a3a

Caused by:
  revspec 'da820a3ab266fce07c9a8abee3e6e9231cb93ec5' not found; class=Reference (4); code=NotFound (-3)
```

<!-- 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/23874)
<!-- Reviewable:end -->
bors-servo added a commit that referenced this pull request Jul 28, 2019
Revert "Replace use of callbacks in webxr by channels"

This backs out commit 133a17e / PR #23848 because it relies on a git branch that was apparently removed:

```
$ cargo fetch
    Updating git repository `https://github.com/asajeffrey/webxr`
error: failed to resolve patches for `https://github.com/servo/webxr`

Caused by:
  failed to load source for a dependency on `webxr`

Caused by:
  Unable to update https://github.com/asajeffrey/webxr?branch=optional-glsync#da820a3a

Caused by:
  revspec 'da820a3ab266fce07c9a8abee3e6e9231cb93ec5' not found; class=Reference (4); code=NotFound (-3)
```

<!-- 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/23874)
<!-- Reviewable:end -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

7 participants
You can’t perform that action at this time.