diff options
| author | Jeff Vander Stoep <jeffv@google.com> | 2023-02-16 09:45:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-02-16 09:45:46 +0000 |
| commit | a6b7e988e4b17236dff3754d089fea97f2272595 (patch) | |
| tree | 0e8a296fe498578f456ceb353befe8098772f242 | |
| parent | 59c0076edfd088797c7b7978276b5086fcb1e1a7 (diff) | |
| parent | 381222a2ba121d7339b26083d24c0aa9d5f6911f (diff) | |
| download | futures-core-a6b7e988e4b17236dff3754d089fea97f2272595.tar.gz | |
Upgrade futures-core to 0.3.26 am: d449045c31 am: 381222a2ba
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-core/+/2438291
Change-Id: Ief351e1f83c214a5a668a63d06c98407c2a82708
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | .cargo_vcs_info.json | 2 | ||||
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | Cargo.toml | 7 | ||||
| -rw-r--r-- | Cargo.toml.orig | 3 | ||||
| -rw-r--r-- | METADATA | 10 | ||||
| -rw-r--r-- | src/task/__internal/atomic_waker.rs | 11 |
6 files changed, 23 insertions, 12 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json index e178fd2..2de4b01 100644 --- a/.cargo_vcs_info.json +++ b/.cargo_vcs_info.json @@ -1,6 +1,6 @@ { "git": { - "sha1": "77d82198c5afd04af3e760a6aa50b7e875289fc3" + "sha1": "5e3693a350f96244151081d2c030208cd15f9572" }, "path_in_vcs": "futures-core" }
\ No newline at end of file @@ -42,7 +42,7 @@ rust_library { host_supported: true, crate_name: "futures_core", cargo_env_compat: true, - cargo_pkg_version: "0.3.25", + cargo_pkg_version: "0.3.26", srcs: ["src/lib.rs"], edition: "2018", features: [ @@ -13,7 +13,7 @@ edition = "2018" rust-version = "1.36" name = "futures-core" -version = "0.3.25" +version = "0.3.26" description = """ The core traits and types in for the `futures` library. """ @@ -29,7 +29,10 @@ rustdoc-args = [ "docsrs", ] -[dependencies] +[dependencies.portable-atomic] +version = "1" +optional = true +default-features = false [dev-dependencies] diff --git a/Cargo.toml.orig b/Cargo.toml.orig index f80c1a4..5b78edc 100644 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -1,6 +1,6 @@ [package] name = "futures-core" -version = "0.3.25" +version = "0.3.26" edition = "2018" rust-version = "1.36" license = "MIT OR Apache-2.0" @@ -21,6 +21,7 @@ unstable = [] cfg-target-has-atomic = [] [dependencies] +portable-atomic = { version = "1", default-features = false, optional = true } [dev-dependencies] futures = { path = "../futures" } @@ -11,13 +11,13 @@ third_party { } url { type: ARCHIVE - value: "https://static.crates.io/crates/futures-core/futures-core-0.3.25.crate" + value: "https://static.crates.io/crates/futures-core/futures-core-0.3.26.crate" } - version: "0.3.25" + version: "0.3.26" license_type: NOTICE last_upgrade_date { - year: 2022 - month: 12 - day: 12 + year: 2023 + month: 2 + day: 15 } } diff --git a/src/task/__internal/atomic_waker.rs b/src/task/__internal/atomic_waker.rs index d49d043..0677e83 100644 --- a/src/task/__internal/atomic_waker.rs +++ b/src/task/__internal/atomic_waker.rs @@ -1,9 +1,16 @@ use core::cell::UnsafeCell; use core::fmt; -use core::sync::atomic::AtomicUsize; -use core::sync::atomic::Ordering::{AcqRel, Acquire, Release}; use core::task::Waker; +use atomic::AtomicUsize; +use atomic::Ordering::{AcqRel, Acquire, Release}; + +#[cfg(feature = "portable-atomic")] +use portable_atomic as atomic; + +#[cfg(not(feature = "portable-atomic"))] +use core::sync::atomic; + /// A synchronization primitive for task wakeup. /// /// Sometimes the task interested in a given event will change over time. |