diff options
author | Chih-Hung Hsieh <chh@google.com> | 2020-10-25 23:16:22 -0700 |
---|---|---|
committer | Chih-Hung Hsieh <chh@google.com> | 2020-10-25 23:16:22 -0700 |
commit | d67a222108601e10f877f6446624d389ff3442e9 (patch) | |
tree | dbd25930aa9318b419c06ec2f00a3532e8922157 | |
parent | e5c9b0e139ac928d94764815962cad704c06e8ba (diff) | |
download | futures-task-d67a222108601e10f877f6446624d389ff3442e9.tar.gz |
Upgrade rust/crates/futures-task to 0.3.7
Test: make all rust crates
Change-Id: I625b1a6153d45d70a74e73be17481c283008510c
-rw-r--r-- | Android.bp | 2 | ||||
-rw-r--r-- | Cargo.toml | 4 | ||||
-rw-r--r-- | Cargo.toml.orig | 4 | ||||
-rw-r--r-- | METADATA | 8 | ||||
-rw-r--r-- | src/lib.rs | 7 | ||||
-rw-r--r-- | src/waker.rs | 2 |
6 files changed, 16 insertions, 11 deletions
@@ -46,4 +46,4 @@ rust_library { } // dependent_library ["feature_list"] -// once_cell-1.4.0 "std" +// once_cell-1.4.1 "std" @@ -13,11 +13,11 @@ [package] edition = "2018" name = "futures-task" -version = "0.3.5" +version = "0.3.7" authors = ["Alex Crichton <alex@alexcrichton.com>"] description = "Tools for working with tasks.\n" homepage = "https://rust-lang.github.io/futures-rs" -documentation = "https://docs.rs/futures-task/0.3.5" +documentation = "https://docs.rs/futures-task/0.3.7" license = "MIT OR Apache-2.0" repository = "https://github.com/rust-lang/futures-rs" [package.metadata.docs.rs] diff --git a/Cargo.toml.orig b/Cargo.toml.orig index fdf27ca..f07ec6f 100644 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -1,12 +1,12 @@ [package] name = "futures-task" edition = "2018" -version = "0.3.5" +version = "0.3.7" authors = ["Alex Crichton <alex@alexcrichton.com>"] license = "MIT OR Apache-2.0" repository = "https://github.com/rust-lang/futures-rs" homepage = "https://rust-lang.github.io/futures-rs" -documentation = "https://docs.rs/futures-task/0.3.5" +documentation = "https://docs.rs/futures-task/0.3.7" description = """ Tools for working with tasks. """ @@ -7,13 +7,13 @@ third_party { } url { type: ARCHIVE - value: "https://static.crates.io/crates/futures-task/futures-task-0.3.5.crate" + value: "https://static.crates.io/crates/futures-task/futures-task-0.3.7.crate" } - version: "0.3.5" + version: "0.3.7" license_type: NOTICE last_upgrade_date { year: 2020 - month: 5 - day: 8 + month: 10 + day: 25 } } @@ -9,9 +9,14 @@ #![cfg_attr(test, warn(single_use_lifetimes))] #![warn(clippy::all)] +// mem::take requires Rust 1.40, matches! requires Rust 1.42 +// Can be removed if the minimum supported version increased or if https://github.com/rust-lang/rust-clippy/issues/3941 +// get's implemented. +#![allow(clippy::mem_replace_with_default, clippy::match_like_matches_macro)] + #![doc(test(attr(deny(warnings), allow(dead_code, unused_assignments, unused_variables))))] -#![doc(html_root_url = "https://docs.rs/futures-task/0.3.5")] +#![doc(html_root_url = "https://docs.rs/futures-task/0.3.7")] #[cfg(all(feature = "cfg-target-has-atomic", not(feature = "unstable")))] compile_error!("The `cfg-target-has-atomic` feature requires the `unstable` feature as an explicit opt-in to unstable features"); diff --git a/src/waker.rs b/src/waker.rs index 635bfe8..265a445 100644 --- a/src/waker.rs +++ b/src/waker.rs @@ -18,7 +18,7 @@ pub(super) fn waker_vtable<W: ArcWake>() -> &'static RawWakerVTable { /// [`ArcWake.wake()`](ArcWake::wake) if awoken. pub fn waker<W>(wake: Arc<W>) -> Waker where - W: ArcWake, + W: ArcWake + 'static, { let ptr = Arc::into_raw(wake) as *const (); |