diff options
author | Jeffrey Vander Stoep <jeffv@google.com> | 2022-12-12 18:51:56 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-12-12 18:51:56 +0000 |
commit | fe66f002622a7f5e644bfe7e63a810cfe2bdc4fd (patch) | |
tree | ba9085fcbdf82553fef3293404a8748f5f4e5e11 | |
parent | 14b0a4c4fc0aceb83938396ca9588682fdb83a6d (diff) | |
parent | 8bf95d110c9c4332c1d408773d5a5628744c0bf4 (diff) | |
download | futures-core-fe66f002622a7f5e644bfe7e63a810cfe2bdc4fd.tar.gz |
Merge "Upgrade futures-core to 0.3.25" am: 20ec46fbc0 am: 74adbd6e33 am: 8bf95d110c
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-core/+/2337752
Change-Id: Ib1af482ab6f9e60d470204b3a23516f7ae7be674
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 | 3 | ||||
-rw-r--r-- | Cargo.toml.orig | 2 | ||||
-rw-r--r-- | METADATA | 12 | ||||
-rw-r--r-- | no_atomic_cas.rs | 4 |
6 files changed, 17 insertions, 8 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json index 724f674..e178fd2 100644 --- a/.cargo_vcs_info.json +++ b/.cargo_vcs_info.json @@ -1,6 +1,6 @@ { "git": { - "sha1": "fc1e3250219170e31cddb8857a276cba7dd08d44" + "sha1": "77d82198c5afd04af3e760a6aa50b7e875289fc3" }, "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.21", + cargo_pkg_version: "0.3.25", srcs: ["src/lib.rs"], edition: "2018", features: [ @@ -13,11 +13,12 @@ edition = "2018" rust-version = "1.36" name = "futures-core" -version = "0.3.21" +version = "0.3.25" description = """ The core traits and types in for the `futures` library. """ homepage = "https://rust-lang.github.io/futures-rs" +readme = "README.md" license = "MIT OR Apache-2.0" repository = "https://github.com/rust-lang/futures-rs" diff --git a/Cargo.toml.orig b/Cargo.toml.orig index 4a360f8..f80c1a4 100644 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -1,6 +1,6 @@ [package] name = "futures-core" -version = "0.3.21" +version = "0.3.25" edition = "2018" rust-version = "1.36" license = "MIT OR Apache-2.0" @@ -1,3 +1,7 @@ +# This project was upgraded with external_updater. +# Usage: tools/external_updater/updater.sh update rust/crates/futures-core +# For more info, check https://cs.android.com/android/platform/superproject/+/master:tools/external_updater/README.md + name: "futures-core" description: "The core traits and types in for the `futures` library." third_party { @@ -7,13 +11,13 @@ third_party { } url { type: ARCHIVE - value: "https://static.crates.io/crates/futures-core/futures-core-0.3.21.crate" + value: "https://static.crates.io/crates/futures-core/futures-core-0.3.25.crate" } - version: "0.3.21" + version: "0.3.25" license_type: NOTICE last_upgrade_date { year: 2022 - month: 3 - day: 1 + month: 12 + day: 12 } } diff --git a/no_atomic_cas.rs b/no_atomic_cas.rs index 9b05d4b..16ec628 100644 --- a/no_atomic_cas.rs +++ b/no_atomic_cas.rs @@ -2,12 +2,16 @@ // It is not intended for manual editing. const NO_ATOMIC_CAS: &[&str] = &[ + "armv4t-none-eabi", + "armv5te-none-eabi", "avr-unknown-gnu-atmega328", "bpfeb-unknown-none", "bpfel-unknown-none", "msp430-none-elf", "riscv32i-unknown-none-elf", + "riscv32im-unknown-none-elf", "riscv32imc-unknown-none-elf", "thumbv4t-none-eabi", + "thumbv5te-none-eabi", "thumbv6m-none-eabi", ]; |