Closed
Conversation
9 tasks
Contributor
|
I merged the PR + published it on crates.io |
SimonSapin
force-pushed
the
ws
branch
2 times, most recently
from
802f809 to
718d1bb
Compare
Eijebong
reviewed
Jul 29, 2019
| @@ -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" | |||
Contributor
There was a problem hiding this comment.
You'll have to add the dupe to the servo-tidy.toml file (or even better, fix the dupe :D)
Member
Author
There was a problem hiding this comment.
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.
Member
Author
There was a problem hiding this comment.
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
Member
Author
There was a problem hiding this comment.
./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
force-pushed
the
ws
branch
2 times, most recently
from
f9c1ccc to
05241cc
Compare
Contributor
|
☔ The latest upstream changes (presumably #3735) made this pull request unmergeable. Please resolve the merge conflicts. |
bors-servo
pushed a commit
to servo/servo
that referenced
this pull request
Aug 16, 2019
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
pushed a commit
to servo/servo
that referenced
this pull request
Aug 16, 2019
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
pushed a commit
to servo/servo
that referenced
this pull request
Aug 17, 2019
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 -->
Member
Author
moz-v2v-gh
pushed a commit
to mozilla/gecko-dev
that referenced
this pull request
Aug 18, 2019
[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
pushed a commit
to moz-gfx/webrender
that referenced
this pull request
Aug 18, 2019
[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
bors-servo
pushed a commit
that referenced
this pull request
Aug 18, 2019
Sync changes from mozilla-central Fixes #3720,
xeonchen
pushed a commit
to xeonchen/gecko
that referenced
this pull request
Aug 18, 2019
[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
[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
[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
[import_pr] From servo/webrender#3720 MozReview-Commit-ID: AsI4hT0cFGJ Differential Revision: https://phabricator.services.mozilla.com/D42363 UltraBlame original commit: 74064a61eb294e3b6e2fd8b05aa9f189f08af889
bhearsum
pushed a commit
to mozilla-releng/staging-firefox
that referenced
this pull request
May 1, 2025
[import_pr] From servo/webrender#3720 MozReview-Commit-ID: AsI4hT0cFGJ Differential Revision: https://phabricator.services.mozilla.com/D42363
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This depends on housleyjk/ws-rs#283.This change is