Upgrade rust/crates/futures-executor to 0.3.16
Test: make
Change-Id: I8d978323eef7db7f57a4211ca2959d88741fbdb5
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index ec6442e..99dc8b0 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,5 +1,5 @@
{
"git": {
- "sha1": "fc080d153bc7bf00429ec5e2b91e2f21f2243846"
+ "sha1": "ab38fd29d3f84f8fc028fa7883e53dba423da0ee"
}
}
diff --git a/Android.bp b/Android.bp
index c6ba129..e212c0a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -66,11 +66,11 @@
// dependent_library ["feature_list"]
// autocfg-1.0.1
-// futures-core-0.3.15 "alloc,std"
-// futures-task-0.3.15 "alloc,std"
-// futures-util-0.3.15 "alloc,slab,std"
-// libc-0.2.94 "default,std"
+// 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.6
+// pin-project-lite-0.2.7
// pin-utils-0.1.0
-// slab-0.4.3 "default,std"
+// slab-0.4.4 "default,std"
diff --git a/Cargo.toml b/Cargo.toml
index 17383a4..e94aef9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,17 +3,16 @@
# When uploading crates to the registry Cargo will automatically
# "normalize" Cargo.toml files for maximal compatibility
# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
+# If you are reading this file be aware that the original Cargo.toml
+# will likely look very different (and much more reasonable).
+# See Cargo.toml.orig for the original contents.
[package]
edition = "2018"
name = "futures-executor"
-version = "0.3.15"
+version = "0.3.16"
authors = ["Alex Crichton <alex@alexcrichton.com>"]
description = "Executors for asynchronous tasks based on the futures-rs library.\n"
homepage = "https://rust-lang.github.io/futures-rs"
@@ -24,15 +23,15 @@
all-features = true
rustdoc-args = ["--cfg", "docsrs"]
[dependencies.futures-core]
-version = "0.3.15"
+version = "0.3.16"
default-features = false
[dependencies.futures-task]
-version = "0.3.15"
+version = "0.3.16"
default-features = false
[dependencies.futures-util]
-version = "0.3.15"
+version = "0.3.16"
default-features = false
[dependencies.num_cpus]
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index 55c69e3..286b253 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,7 +1,7 @@
[package]
name = "futures-executor"
edition = "2018"
-version = "0.3.15"
+version = "0.3.16"
authors = ["Alex Crichton <alex@alexcrichton.com>"]
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.15", default-features = false }
-futures-task = { path = "../futures-task", version = "0.3.15", default-features = false }
-futures-util = { path = "../futures-util", version = "0.3.15", default-features = false }
+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 }
num_cpus = { version = "1.8.0", optional = true }
[dev-dependencies]
diff --git a/METADATA b/METADATA
index ac9c274..5d2aba3 100644
--- a/METADATA
+++ b/METADATA
@@ -7,13 +7,13 @@
}
url {
type: ARCHIVE
- value: "https://static.crates.io/crates/futures-executor/futures-executor-0.3.15.crate"
+ value: "https://static.crates.io/crates/futures-executor/futures-executor-0.3.16.crate"
}
- version: "0.3.15"
+ version: "0.3.16"
license_type: NOTICE
last_upgrade_date {
year: 2021
- month: 5
- day: 19
+ month: 8
+ day: 9
}
}
diff --git a/src/lib.rs b/src/lib.rs
index 873ac7a..b1af875 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -37,11 +37,20 @@
//! [`spawn_local_obj`]: https://docs.rs/futures/0.3/futures/task/trait.LocalSpawn.html#tymethod.spawn_local_obj
#![cfg_attr(not(feature = "std"), no_std)]
-#![warn(missing_docs, missing_debug_implementations, rust_2018_idioms, unreachable_pub)]
-// It cannot be included in the published code because this lints have false positives in the minimum required version.
-#![cfg_attr(test, warn(single_use_lifetimes))]
-#![warn(clippy::all)]
-#![doc(test(attr(deny(warnings), allow(dead_code, unused_assignments, unused_variables))))]
+#![warn(
+ missing_debug_implementations,
+ missing_docs,
+ rust_2018_idioms,
+ single_use_lifetimes,
+ unreachable_pub
+)]
+#![doc(test(
+ no_crate_inject,
+ attr(
+ deny(warnings, rust_2018_idioms, single_use_lifetimes),
+ allow(dead_code, unused_assignments, unused_variables)
+ )
+))]
#![cfg_attr(docsrs, feature(doc_cfg))]
#[cfg(feature = "std")]
diff --git a/src/thread_pool.rs b/src/thread_pool.rs
index f2347db..5e1f586 100644
--- a/src/thread_pool.rs
+++ b/src/thread_pool.rs
@@ -245,7 +245,7 @@
/// Execute closure `f` just prior to shutting down each worker thread.
///
/// This hook is intended for bookkeeping and monitoring.
- /// The closure `f` will be dropped after the `builder` is droppped
+ /// The closure `f` will be dropped after the `builder` is dropped
/// and all threads in the pool have executed it.
///
/// The closure provided will receive an index corresponding to the worker
@@ -367,7 +367,7 @@
.create()
.unwrap();
- // After ThreadPoolBuilder is deconstructed, the tx should be droped
+ // After ThreadPoolBuilder is deconstructed, the tx should be dropped
// so that we can use rx as an iterator.
let count = rx.into_iter().count();
assert_eq!(count, 2);
diff --git a/tests/local_pool.rs b/tests/local_pool.rs
index 56e6daa..9b1316b 100644
--- a/tests/local_pool.rs
+++ b/tests/local_pool.rs
@@ -404,7 +404,7 @@
}
// Tests that the use of park/unpark in user-code has no
-// effect on the expected behaviour of the executor.
+// effect on the expected behavior of the executor.
#[test]
fn park_unpark_independence() {
let mut done = false;
