aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <servo-ops@mozilla.com>2020-06-16 03:16:12 -0400
committerGitHub <noreply@github.com>2020-06-16 03:16:12 -0400
commit19c1f72eb2fe5178311161b6c85a67956a5a69b3 (patch)
treeaf0f311638b31fffa3587ffefd1045a2216b8ce5
parente45c805f28756f0c081a49553b2d9aa171a25d49 (diff)
parentee352dfe653be9b31594fd83d97bc2628ba658bc (diff)
downloadservo-19c1f72eb2fe5178311161b6c85a67956a5a69b3.tar.gz
servo-19c1f72eb2fe5178311161b6c85a67956a5a69b3.zip
Auto merge of #26914 - servo:dependabot/cargo/futures-util-0.3.5, r=jdm
build(deps): bump futures-util from 0.3.4 to 0.3.5 Bumps [futures-util](https://github.com/rust-lang/futures-rs) from 0.3.4 to 0.3.5. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/rust-lang/futures-rs/releases">futures-util's releases</a>.</em></p> <blockquote> <h2>0.3.5</h2> <ul> <li>Added <code>StreamExt::flat_map</code>.</li> <li>Added <code>StreamExt::ready_chunks</code>.</li> <li>Added <code>*_unpin</code> methods to <code>SinkExt</code>.</li> <li>Added a <code>cancellation()</code> future to <code>oneshot::Sender</code>.</li> <li>Added <code>reunite</code> method to <code>ReadHalf</code> and <code>WriteHalf</code>.</li> <li>Added <code>Extend</code> implementations for <code>Futures(Un)Ordered</code> and <code>SelectAll</code>.</li> <li>Added support for reexporting the <code>join!</code> and <code>select!</code> macros.</li> <li>Added <code>no_std</code> support for the <code>pending!</code> and <code>poll!</code> macros.</li> <li>Added <code>Send</code> and <code>Sync</code> support for <code>AssertUnmoved</code>.</li> <li>Fixed a bug where <code>Shared</code> wasn't relinquishing control to the executor.</li> <li>Removed the <code>Send</code> bound on the output of <code>RemoteHandle</code>.</li> <li>Relaxed bounds on <code>FuturesUnordered</code>.</li> <li>Reorganized internal tests to work under different <code>--feature</code>s.</li> <li>Reorganized the bounds on <code>StreamExt::forward</code>.</li> <li>Removed and replaced a large amount of internal <code>unsafe</code>.</li> </ul> </blockquote> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/rust-lang/futures-rs/blob/master/CHANGELOG.md">futures-util's changelog</a>.</em></p> <blockquote> <h1>0.3.5 - 2020-05-08</h1> <ul> <li>Added <code>StreamExt::flat_map</code>.</li> <li>Added <code>StreamExt::ready_chunks</code>.</li> <li>Added <code>*_unpin</code> methods to <code>SinkExt</code>.</li> <li>Added a <code>cancellation()</code> future to <code>oneshot::Sender</code>.</li> <li>Added <code>reunite</code> method to <code>ReadHalf</code> and <code>WriteHalf</code>.</li> <li>Added <code>Extend</code> implementations for <code>Futures(Un)Ordered</code> and <code>SelectAll</code>.</li> <li>Added support for reexporting the <code>join!</code> and <code>select!</code> macros.</li> <li>Added <code>no_std</code> support for the <code>pending!</code> and <code>poll!</code> macros.</li> <li>Added <code>Send</code> and <code>Sync</code> support for <code>AssertUnmoved</code>.</li> <li>Fixed a bug where <code>Shared</code> wasn't relinquishing control to the executor.</li> <li>Removed the <code>Send</code> bound on the output of <code>RemoteHandle</code>.</li> <li>Relaxed bounds on <code>FuturesUnordered</code>.</li> <li>Reorganized internal tests to work under different <code>--feature</code>s.</li> <li>Reorganized the bounds on <code>StreamExt::forward</code>.</li> <li>Removed and replaced a large amount of internal <code>unsafe</code>.</li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/rust-lang/futures-rs/commit/4ceafb384c18e664a507892b16c98322a6e240a1"><code>4ceafb3</code></a> Stage 0.3.5</li> <li><a href="https://github.com/rust-lang/futures-rs/commit/5b91728e10a47742d3913501fc13ff0da240bdd5"><code>5b91728</code></a> Drop unneeded Send/Sync bound from AssertUnmoved</li> <li><a href="https://github.com/rust-lang/futures-rs/commit/4b930bb4702b1f57cabe3ae6d9c499833bd7d520"><code>4b930bb</code></a> Implement Send + Sync for AssertUnmoved</li> <li><a href="https://github.com/rust-lang/futures-rs/commit/3bf5ac99e939e6ff70283937fa91e8d77e5f70e8"><code>3bf5ac9</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/rust-lang/futures-rs/issues/2128">#2128</a> from Diggsey/snip</li> <li><a href="https://github.com/rust-lang/futures-rs/commit/1b44548be753ff0b7d2e4eabe7de4d2e199cfaf2"><code>1b44548</code></a> Merge branch 'master' into snip</li> <li><a href="https://github.com/rust-lang/futures-rs/commit/32005e3f74f2b48a9ca0e97a63ff25976c863703"><code>32005e3</code></a> fix: Shared must relinquish control to the executor if repolled</li> <li><a href="https://github.com/rust-lang/futures-rs/commit/dc06edaf5428009fb4189af5a64cc2d23bd3955c"><code>dc06eda</code></a> Update pin-utils to 0.1</li> <li><a href="https://github.com/rust-lang/futures-rs/commit/dc00793b38acfb5cf001ad975b60bb94ef0d45ae"><code>dc00793</code></a> Make ready and lazy's panic messages easy to understand</li> <li><a href="https://github.com/rust-lang/futures-rs/commit/127b244ecd779b4be0e59218986c2b3708f862f9"><code>127b244</code></a> Allow pending! and poll! in no_std</li> <li><a href="https://github.com/rust-lang/futures-rs/commit/dfc66739469a4fe849987a676c9b3be6011f1fb8"><code>dfc6673</code></a> Update futures-util/src/future/future/flatten.rs</li> <li>Additional commits viewable in <a href="https://github.com/rust-lang/futures-rs/compare/0.3.4...0.3.5">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=futures-util&package-manager=cargo&previous-version=0.3.4&new-version=0.3.5)](https://dependabot.com/compatibility-score/?dependency-name=futures-util&package-manager=cargo&previous-version=0.3.4&new-version=0.3.5) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) - `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language - `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language - `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language - `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language - `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme Additionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com): - Update frequency (including time of day and day of week) - Pull request limits (per update run and/or open at any time) - Out-of-range updates (receive only lockfile updates, if desired) - Security updates (receive only security updates, if desired) </details>
-rw-r--r--Cargo.lock33
1 files changed, 27 insertions, 6 deletions
diff --git a/Cargo.lock b/Cargo.lock
index f0c42102cfd..03e2674e91c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1624,9 +1624,9 @@ dependencies = [
[[package]]
name = "futures-macro"
-version = "0.3.4"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a5081aa3de1f7542a794a397cde100ed903b0630152d0973479018fd85423a7"
+checksum = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39"
dependencies = [
"proc-macro-hack",
"proc-macro2 1.0.17",
@@ -1651,13 +1651,14 @@ dependencies = [
[[package]]
name = "futures-util"
-version = "0.3.4"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22766cf25d64306bedf0384da004d05c9974ab104fcc4528f1236181c18004c5"
+checksum = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6"
dependencies = [
"futures-core",
"futures-macro",
"futures-task",
+ "pin-project",
"pin-utils",
"proc-macro-hack",
"proc-macro-nested",
@@ -4064,10 +4065,30 @@ dependencies = [
]
[[package]]
+name = "pin-project"
+version = "0.4.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12e3a6cdbfe94a5e4572812a0201f8c0ed98c1c452c7b8563ce2276988ef9c17"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "0.4.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a0ffd45cf79d88737d7cc85bfd5d2894bee1139b356e616fe85dc389c61aaf7"
+dependencies = [
+ "proc-macro2 1.0.17",
+ "quote 1.0.2",
+ "syn",
+]
+
+[[package]]
name = "pin-utils"
-version = "0.1.0-alpha.4"
+version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5894c618ce612a3fa23881b152b608bafb8c56cfc22f434a3ba3120b40f7b587"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
name = "pixels"