Upgrade rust/crates/futures-executor to 0.3.17 am: 4d96f2d45e am: b6b3e4d72d am: 9a78e77faa
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-executor/+/1833614
Change-Id: I3c411573a977b3fca529b4bd027cdceeb20f5cd2
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"
}
}
diff --git a/Android.bp b/Android.bp
index e212c0a..1484bf5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -43,6 +43,8 @@
name: "libfutures_executor",
host_supported: true,
crate_name: "futures_executor",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.3.17",
srcs: ["src/lib.rs"],
edition: "2018",
features: [
@@ -63,14 +65,3 @@
],
min_sdk_version: "29",
}
-
-// dependent_library ["feature_list"]
-// autocfg-1.0.1
-// futures-core-0.3.16 "alloc,std"
-// futures-task-0.3.16 "alloc,std"
-// futures-util-0.3.16 "alloc,slab,std"
-// libc-0.2.98 "default,std"
-// num_cpus-1.13.0
-// pin-project-lite-0.2.7
-// pin-utils-0.1.0
-// slab-0.4.4 "default,std"
diff --git a/Cargo.toml b/Cargo.toml
index e94aef9..51c2750 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,7 @@
[package]
edition = "2018"
name = "futures-executor"
-version = "0.3.16"
+version = "0.3.17"
authors = ["Alex Crichton <[email protected]>"]
description = "Executors for asynchronous tasks based on the futures-rs library.\n"
homepage = "https://rust-lang.github.io/futures-rs"
@@ -23,15 +23,15 @@
all-features = true
rustdoc-args = ["--cfg", "docsrs"]
[dependencies.futures-core]
-version = "0.3.16"
+version = "0.3.17"
default-features = false
[dependencies.futures-task]
-version = "0.3.16"
+version = "0.3.17"
default-features = false
[dependencies.futures-util]
-version = "0.3.16"
+version = "0.3.17"
default-features = false
[dependencies.num_cpus]
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index 286b253..6d6f71b 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,7 +1,7 @@
[package]
name = "futures-executor"
edition = "2018"
-version = "0.3.16"
+version = "0.3.17"
authors = ["Alex Crichton <[email protected]>"]
license = "MIT OR Apache-2.0"
repository = "https://github.com/rust-lang/futures-rs"
@@ -17,9 +17,9 @@
thread-pool = ["std", "num_cpus"]
[dependencies]
-futures-core = { path = "../futures-core", version = "0.3.16", default-features = false }
-futures-task = { path = "../futures-task", version = "0.3.16", default-features = false }
-futures-util = { path = "../futures-util", version = "0.3.16", default-features = false }
+futures-core = { path = "../futures-core", version = "0.3.17", default-features = false }
+futures-task = { path = "../futures-task", version = "0.3.17", default-features = false }
+futures-util = { path = "../futures-util", version = "0.3.17", default-features = false }
num_cpus = { version = "1.8.0", optional = true }
[dev-dependencies]
diff --git a/METADATA b/METADATA
index 5d2aba3..0a1c47b 100644
--- a/METADATA
+++ b/METADATA
@@ -7,13 +7,13 @@
}
url {
type: ARCHIVE
- value: "https://static.crates.io/crates/futures-executor/futures-executor-0.3.16.crate"
+ value: "https://static.crates.io/crates/futures-executor/futures-executor-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
}
}
