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

Bump ipc-channel and bincode #20371

Merged
merged 1 commit into from Mar 21, 2018
Merged

Bump ipc-channel and bincode #20371

merged 1 commit into from Mar 21, 2018

Conversation

@Eijebong
Copy link
Member

Eijebong commented Mar 20, 2018 •
edited by SimonSapin

This change is Reviewable
@highfive
Copy link

highfive commented Mar 20, 2018

Heads up! This PR modifies the following files:

  • @jgraham: components/webdriver_server/Cargo.toml
  • @emilio: components/layout/Cargo.toml
  • @fitzgen: components/devtools_traits/Cargo.toml, components/profile/Cargo.toml, components/profile_traits/Cargo.toml, components/devtools/Cargo.toml, components/script/Cargo.toml and 2 more
  • @KiChjang: components/script/Cargo.toml, components/script/dom/worklet.rs, components/net/Cargo.toml, components/net_traits/Cargo.toml, components/script_traits/Cargo.toml
  • @asajeffrey: components/constellation/Cargo.toml, components/script/Cargo.toml, components/script/dom/worklet.rs, components/webdriver_server/Cargo.toml
  • @cbrewster: components/constellation/Cargo.toml
  • @edunham: servo-tidy.toml
  • @paulrouget: components/servo/Cargo.toml, components/compositing/Cargo.toml, components/constellation/Cargo.toml
@Eijebong
Copy link
Member Author

Eijebong commented Mar 20, 2018

cc @staktrace
@nox
Copy link
Member

nox commented Mar 21, 2018

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Mar 21, 2018

📌 Commit 19b026c has been approved by nox
@highfive highfive assigned nox and unassigned jdm Mar 21, 2018
@bors-servo
Copy link
Contributor

bors-servo commented Mar 21, 2018

🔒 Merge conflict
@bors-servo
Copy link
Contributor

bors-servo commented Mar 21, 2018

☔ The latest upstream changes (presumably #20298) made this pull request unmergeable. Please resolve the merge conflicts.
@Eijebong
Bump ipc-channel and bincode
Loading status checks…
570d865 
This required bumping uuid too which unfortunately duplicated rand.
@Eijebong Eijebong force-pushed the Eijebong:ipc-channel branch from 19b026c to 570d865 Mar 21, 2018
@Eijebong
Copy link
Member Author

Eijebong commented Mar 21, 2018

There, rebased
@nox
Copy link
Member

nox commented Mar 21, 2018

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Mar 21, 2018

📌 Commit 570d865 has been approved by nox
bors-servo added a commit that referenced this pull request Mar 21, 2018
@bors-servo
Auto merge of #20371 - Eijebong:ipc-channel, r=nox
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…
02c758a 
Bump ipc-channel and bincode

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

bors-servo commented Mar 21, 2018

⌛ Testing commit 570d865 with merge 02c758a...
@bors-servo
Copy link
Contributor

bors-servo commented Mar 21, 2018

☀️ Test successful - android, 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, windows-msvc-dev
Approved by: nox
Pushing 02c758a to master...
@bors-servo bors-servo mentioned this pull request Mar 21, 2018
Open
2 of 5 tasks complete
@bors-servo bors-servo merged commit 570d865 into servo:master Mar 21, 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
@bors-servo bors-servo mentioned this pull request Mar 21, 2018
Closed
3 of 4 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nox nox

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@Eijebong @highfive @nox @bors-servo @jdm
You can’t perform that action at this time.