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

Update ipc-channel #2962

Merged
merged 1 commit into from Aug 10, 2018

Conversation

Projects
None yet
4 participants
@SimonSapin
Copy link
Member

commented Aug 9, 2018

This change is Reviewable

"checksum crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f739f8c5363aca78cfb059edf753d8f0d36908c348f3d8d1503f03d8b75d9cf3"
"checksum crossbeam-epoch 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "927121f5407de9956180ff5e936fe3cf4324279280001cd56b669d28ee7e9150"
"checksum crossbeam-epoch 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "30fecfcac6abfef8771151f8be4abc9e4edc112c2bcb233314cafde2680536e9"

This comment has been minimized.

Copy link
@kvark

kvark Aug 9, 2018

Member

duplicate crossbeam dependencies detected

This comment has been minimized.

Copy link
@SimonSapin

SimonSapin Aug 9, 2018

Author Member

Yes, it looks like Rayon decided not to upgrade: servo/servo#21325 (comment)

@@ -1749,6 +1810,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e44651a0dc4cdd99f71c83b561e221f714912d11af1a4dff0631f923d53af035"
"checksum rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)" = "15a732abf9d20f0ad8eeb6f909bf6868722d9a06e1e50802b6a70351f40b4eb1"
"checksum rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "eba5f8cb59cc50ed56be8880a5c7b496bfd9bd26394e176bc67884094145c2c5"
"checksum rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e464cd887e869cddcae8792a4ee31d23c7edd516700695608f5b98c67ee0131c"

This comment has been minimized.

Copy link
@kvark

kvark Aug 9, 2018

Member

we, we have 3 different rand versions linked to

This comment has been minimized.

Copy link
@Eijebong

Eijebong Aug 9, 2018

Member

I thought I deduped rand some time ago...

This comment has been minimized.

Copy link
@SimonSapin

SimonSapin Aug 9, 2018

Author Member

Updating ws removes rand 0.3 but add slab 0.4. Updating again when housleyjk/ws-rs#221 is on crates.io should remove slab 0.3.

This comment has been minimized.

Copy link
@Eijebong

Eijebong Aug 9, 2018

Member

Oh that might be what was missing then, I tend to forget stuff :p

@SimonSapin

This comment has been minimized.

Copy link
Member Author

commented Aug 9, 2018

@bors-servo

This comment has been minimized.

Copy link
Contributor

commented Aug 9, 2018

📌 Commit 38f3b57 has been approved by SimonSapin

bors-servo added a commit that referenced this pull request Aug 10, 2018

Auto merge of #2962 - servo:ipcup, r=SimonSapin
Update ipc-channel

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/webrender/2962)
<!-- Reviewable:end -->
@bors-servo

This comment has been minimized.

Copy link
Contributor

commented Aug 10, 2018

⌛️ Testing commit 38f3b57 with merge 632b340...

@bors-servo

This comment has been minimized.

Copy link
Contributor

commented Aug 10, 2018

☀️ Test successful - status-appveyor, status-taskcluster
Approved by: SimonSapin
Pushing 632b340 to master...

@bors-servo bors-servo merged commit 38f3b57 into master Aug 10, 2018

5 checks passed

Taskcluster (pull_request) TaskGroup: success
Details
Taskcluster (push) TaskGroup: success
Details
continuous-integration/appveyor/branch AppVeyor build succeeded
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details

@SimonSapin SimonSapin deleted the ipcup branch Aug 10, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.