Skip to content

/ webrender

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

Update the ws crate to 0.9 #3720

Closed
wants to merge 1 commit into from
Closed

Update the ws crate to 0.9 #3720

wants to merge 1 commit into from

Conversation

@SimonSapin
Copy link
Member

SimonSapin commented Jul 24, 2019 •
edited

This depends on housleyjk/ws-rs#283.

This change is Reviewable
@SimonSapin SimonSapin mentioned this pull request Jul 24, 2019
Merged
6 of 9 tasks complete
@Eijebong
Copy link
Member

Eijebong commented Jul 29, 2019

I merged the PR + published it on crates.io
@SimonSapin SimonSapin force-pushed the ws branch 2 times, most recently from 802f809 to 718d1bb Jul 29, 2019
@Eijebong
Eijebong reviewed Jul 29, 2019
View changes
Cargo.lock
@@ -2255,6 +2260,7 @@ dependencies = [
"checksum parking_lot_core 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "4db1a8ccf734a7bce794cc19b3df06ed87ab2f3907036b693c68f56b4d4537fa"
"checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9"
"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"

This comment has been minimized.

Sign in to view
@Eijebong

Eijebong Jul 29, 2019

Member

You'll have to add the dupe to the servo-tidy.toml file (or even better, fix the dupe :D)

This comment has been minimized.

Sign in to view
@SimonSapin

SimonSapin Jul 29, 2019

Author Member

Fixing the duplication requires on of rust-windowing/winit#1076 and winit v0.19.2 or crates.io, or winit v0.20.0 to be finished and published on crates.io. (Assuming we’d rather not use an alpha version.) Let’s wait and see if the maintainers are open to making 0.19.2.

This comment has been minimized.

Sign in to view
@SimonSapin

SimonSapin Jul 30, 2019

Author Member

Ok, so…

    Updating crates.io index
      Adding lock_api v0.2.0
      Adding parking_lot v0.8.0
      Adding parking_lot_core v0.5.0
    Removing percent-encoding v1.0.1
      Adding scopeguard v1.0.0
    Updating winit v0.19.1 -> v0.19.2

This comment has been minimized.

Sign in to view
@SimonSapin

SimonSapin Jul 30, 2019

Author Member 
./Cargo.lock:1: duplicate versions for package `lock_api`
	The following packages depend on version 0.1.3 from 'crates.io':
		parking_lot
		parking_lot
	The following packages depend on version 0.2.0 from 'crates.io':
		parking_lot
./Cargo.lock:1: duplicate versions for package `scopeguard`
	The following packages depend on version 0.3.3 from 'crates.io':
		crossbeam-epoch
		crossbeam-epoch
		lock_api
	The following packages depend on version 1.0.0 from 'crates.io':
		lock_api
@SimonSapin SimonSapin force-pushed the ws branch 2 times, most recently from f9c1ccc to 05241cc Aug 15, 2019
@SimonSapin
Upgrade to ws 0.9
Loading status checks…
bb74e4c
@bors-servo
Copy link
Contributor

bors-servo commented Aug 15, 2019

☔ The latest upstream changes (presumably #3735) made this pull request unmergeable. Please resolve the merge conflicts.
bors-servo added a commit to servo/servo that referenced this pull request Aug 16, 2019
@bors-servo
Auto merge of #23838 - servo:url-2.0, r=Manishearth
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…
28c565d 
Update the url crate to 2.0

Blocked on:

* [x] housleyjk/ws-rs#283 + undoing corresponding `[patch.crates-io]` entry

Soft-blocked on: (we could add to the crate duplication allow-list instead)

* [x] ~rust-windowing/winit#1066
  - [x] rust-windowing/winit#1076
* [x] servo/media#288
* [ ] servo/webrender#3720
* [x] gobwas/influent.rs#22
* [ ] https://bugzilla.mozilla.org/show_bug.cgi?id=1568540
  - [x] seanmonstar/warp#260
  - [ ] abonander/multipart#121

<!-- 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/23838)
<!-- Reviewable:end -->
bors-servo added a commit to servo/servo that referenced this pull request Aug 16, 2019
@bors-servo
Auto merge of #23838 - servo:url-2.0, r=Manishearth
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…
cd46195 
Update the url crate to 2.0

Blocked on:

* [x] housleyjk/ws-rs#283 + undoing corresponding `[patch.crates-io]` entry

Soft-blocked on: (we could add to the crate duplication allow-list instead)

* [x] ~rust-windowing/winit#1066
  - [x] rust-windowing/winit#1076
* [x] servo/media#288
* [ ] servo/webrender#3720
* [x] gobwas/influent.rs#22
* [ ] https://bugzilla.mozilla.org/show_bug.cgi?id=1568540
  - [x] seanmonstar/warp#260
  - [ ] abonander/multipart#121

<!-- 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/23838)
<!-- Reviewable:end -->
bors-servo added a commit to servo/servo that referenced this pull request Aug 17, 2019
@bors-servo
Auto merge of #23838 - servo:url-2.0, r=Manishearth
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…
9bba14c 
Update the url crate to 2.0

Blocked on:

* [x] housleyjk/ws-rs#283 + undoing corresponding `[patch.crates-io]` entry

Soft-blocked on: (we could add to the crate duplication allow-list instead)

* [x] ~rust-windowing/winit#1066
  - [x] rust-windowing/winit#1076
* [x] servo/media#288
* [ ] servo/webrender#3720
* [x] gobwas/influent.rs#22
* [ ] https://bugzilla.mozilla.org/show_bug.cgi?id=1568540
  - [x] seanmonstar/warp#260
  - [ ] abonander/multipart#121

<!-- 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/23838)
<!-- Reviewable:end -->
@SimonSapin
Copy link
Member Author

SimonSapin commented Aug 17, 2019

Moved to part of https://bugzilla.mozilla.org/show_bug.cgi?id=1568540.
@SimonSapin SimonSapin closed this Aug 17, 2019
@SimonSapin SimonSapin deleted the ws branch Aug 17, 2019
moz-v2v-gh pushed a commit to mozilla/gecko-dev that referenced this pull request Aug 18, 2019
@SimonSapin
Bug 1568540 - Upgrade to ws 0.9 in WebRender r=emilio
c9af673 
[import_pr] From servo/webrender#3720

MozReview-Commit-ID: AsI4hT0cFGJ

Differential Revision: https://phabricator.services.mozilla.com/D42363

--HG--
extra : moz-landing-system : lando
moz-gfx added a commit to moz-gfx/webrender that referenced this pull request Aug 18, 2019
@SimonSapin @moz-gfx
Bug 1568540 - Upgrade to ws 0.9 in WebRender r=emilio
d5e14fc 
[import_pr] From servo#3720

MozReview-Commit-ID: AsI4hT0cFGJ

Differential Revision: https://phabricator.services.mozilla.com/D42363

[wrupdater] From https://hg.mozilla.org/mozilla-central/rev/74064a61eb294e3b6e2fd8b05aa9f189f08af889
@moz-gfx moz-gfx mentioned this pull request Aug 18, 2019
Merged
bors-servo added a commit that referenced this pull request Aug 18, 2019
@bors-servo
Auto merge of #3738 - moz-gfx:wrupdater, r=moz-gfx
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…
b4a6c6a 
Sync changes from mozilla-central

 Fixes #3720,
xeonchen pushed a commit to xeonchen/gecko that referenced this pull request Aug 18, 2019
@SimonSapin
Bug 1568540 - Upgrade to ws 0.9 in WebRender r=emilio
50ed399 
[import_pr] From servo/webrender#3720

MozReview-Commit-ID: AsI4hT0cFGJ

Differential Revision: https://phabricator.services.mozilla.com/D42363
gecko-dev-updater pushed a commit to marco-c/gecko-dev-comments-removed that referenced this pull request Oct 4, 2019
@marco-c
Bug 1568540 - Upgrade to ws 0.9 in WebRender r=emilio
2548be7 
[import_pr] From servo/webrender#3720

MozReview-Commit-ID: AsI4hT0cFGJ

Differential Revision: https://phabricator.services.mozilla.com/D42363

UltraBlame original commit: 74064a61eb294e3b6e2fd8b05aa9f189f08af889
gecko-dev-updater pushed a commit to marco-c/gecko-dev-wordified that referenced this pull request Oct 4, 2019
@marco-c
Bug 1568540 - Upgrade to ws 0.9 in WebRender r=emilio
f1cbc81 
[import_pr] From servo/webrender#3720

MozReview-Commit-ID: AsI4hT0cFGJ

Differential Revision: https://phabricator.services.mozilla.com/D42363

UltraBlame original commit: 74064a61eb294e3b6e2fd8b05aa9f189f08af889
gecko-dev-updater pushed a commit to marco-c/gecko-dev-wordified-and-comments-removed that referenced this pull request Oct 4, 2019
@marco-c
Bug 1568540 - Upgrade to ws 0.9 in WebRender r=emilio
54a572f 
[import_pr] From servo/webrender#3720

MozReview-Commit-ID: AsI4hT0cFGJ

Differential Revision: https://phabricator.services.mozilla.com/D42363

UltraBlame original commit: 74064a61eb294e3b6e2fd8b05aa9f189f08af889
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Eijebong Eijebong

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
@SimonSapin @Eijebong @bors-servo
You can’t perform that action at this time.