commit d65584b07f3506deff40422d99eaae92f72178b5
author Joel Galenson <jgalenson@google.com> Tue Oct 05 01:43:59 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Oct 05 01:43:59 2021 +0000
tree 26e715644465d45f7f6c55ddf4a1064baa323a85
parent c877add907e9568380cca86c46fdc7626144eee2
parent 60e2aea2c0bd3e5a403503f42e72956341445935

Upgrade rust/crates/futures-channel to 0.3.17 am: 60e2aea2c0

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/1832863

Change-Id: I6983d89dcde4e4812430d2908c2ea03a5f01e6f9

.cargo_vcs_info.json

diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index 99dc8b0..ffd4f55 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,5 +1,5 @@
 {
   "git": {
-    "sha1": "ab38fd29d3f84f8fc028fa7883e53dba423da0ee"
+    "sha1": "7caefa51304e78fd5018cd5d2a03f3b9089cc010"
   }
 }

Android.bp

diff --git a/Android.bp b/Android.bp
index 4abd933..3f6921c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -45,6 +45,8 @@
     name: "libfutures_channel",
     host_supported: true,
     crate_name: "futures_channel",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.3.17",
     srcs: ["src/lib.rs"],
     edition: "2018",
     features: [
@@ -62,6 +64,3 @@
     ],
     min_sdk_version: "29",
 }
-
-// dependent_library ["feature_list"]
-//   futures-core-0.3.16 "alloc,std"

Cargo.toml

diff --git a/Cargo.toml b/Cargo.toml
index e25905c..bea8d51 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,7 @@
 [package]
 edition = "2018"
 name = "futures-channel"
-version = "0.3.16"
+version = "0.3.17"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 description = "Channels for asynchronous communication using futures-rs.\n"
 homepage = "https://rust-lang.github.io/futures-rs"
@@ -23,11 +23,11 @@
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 [dependencies.futures-core]
-version = "0.3.16"
+version = "0.3.17"
 default-features = false
 
 [dependencies.futures-sink]
-version = "0.3.16"
+version = "0.3.17"
 optional = true
 default-features = false
 

Cargo.toml.orig

diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index 1d3cb74..6bd240c 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,7 +1,7 @@
 [package]
 name = "futures-channel"
 edition = "2018"
-version = "0.3.16"
+version = "0.3.17"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/rust-lang/futures-rs"
@@ -23,8 +23,8 @@
 cfg-target-has-atomic = []
 
 [dependencies]
-futures-core = { path = "../futures-core", version = "0.3.16", default-features = false }
-futures-sink = { path = "../futures-sink", version = "0.3.16", default-features = false, optional = true }
+futures-core = { path = "../futures-core", version = "0.3.17", default-features = false }
+futures-sink = { path = "../futures-sink", version = "0.3.17", default-features = false, optional = true }
 
 [dev-dependencies]
 futures = { path = "../futures", default-features = true }

METADATA

diff --git a/METADATA b/METADATA
index a253153..fc42915 100644
--- a/METADATA
+++ b/METADATA
@@ -7,13 +7,13 @@
   }
   url {
     type: ARCHIVE
-    value: "https://static.crates.io/crates/futures-channel/futures-channel-0.3.16.crate"
+    value: "https://static.crates.io/crates/futures-channel/futures-channel-0.3.17.crate"
   }
-  version: "0.3.16"
+  version: "0.3.17"
   license_type: NOTICE
   last_upgrade_date {
     year: 2021
-    month: 8
-    day: 9
+    month: 9
+    day: 22
   }
 }