aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.cargo_vcs_info.json2
-rw-r--r--Android.bp8
-rw-r--r--Cargo.toml3
-rw-r--r--Cargo.toml.orig2
-rw-r--r--METADATA14
-rw-r--r--TEST_MAPPING44
-rw-r--r--cargo2android.json2
-rw-r--r--no_atomic_cas.rs4
-rw-r--r--src/future_obj.rs1
-rw-r--r--src/waker_ref.rs3
10 files changed, 52 insertions, 31 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index 1f750b1..40cce12 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,6 +1,6 @@
{
"git": {
- "sha1": "fc1e3250219170e31cddb8857a276cba7dd08d44"
+ "sha1": "5e3693a350f96244151081d2c030208cd15f9572"
},
"path_in_vcs": "futures-task"
} \ No newline at end of file
diff --git a/Android.bp b/Android.bp
index eebc67c..fa41b4f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -42,7 +42,7 @@ rust_test {
host_supported: true,
crate_name: "futures_task",
cargo_env_compat: true,
- cargo_pkg_version: "0.3.21",
+ cargo_pkg_version: "0.3.26",
srcs: ["src/lib.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
@@ -62,7 +62,7 @@ rust_library {
host_supported: true,
crate_name: "futures_task",
cargo_env_compat: true,
- cargo_pkg_version: "0.3.21",
+ cargo_pkg_version: "0.3.26",
srcs: ["src/lib.rs"],
edition: "2018",
features: [
@@ -72,9 +72,11 @@ rust_library {
],
apex_available: [
"//apex_available:platform",
- "com.android.bluetooth",
+ "com.android.btservices",
"com.android.resolv",
"com.android.virt",
],
+ product_available: true,
+ vendor_available: true,
min_sdk_version: "29",
}
diff --git a/Cargo.toml b/Cargo.toml
index c65433f..27a63b0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,11 +13,12 @@
edition = "2018"
rust-version = "1.45"
name = "futures-task"
-version = "0.3.21"
+version = "0.3.26"
description = """
Tools for working with tasks.
"""
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 77fec6f..4c2d1df 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,6 +1,6 @@
[package]
name = "futures-task"
-version = "0.3.21"
+version = "0.3.26"
edition = "2018"
rust-version = "1.45"
license = "MIT OR Apache-2.0"
diff --git a/METADATA b/METADATA
index 87e267d..4068190 100644
--- a/METADATA
+++ b/METADATA
@@ -1,3 +1,7 @@
+# This project was upgraded with external_updater.
+# Usage: tools/external_updater/updater.sh update rust/crates/futures-task
+# For more info, check https://cs.android.com/android/platform/superproject/+/master:tools/external_updater/README.md
+
name: "futures-task"
description: "Tools for working with tasks."
third_party {
@@ -7,13 +11,13 @@ third_party {
}
url {
type: ARCHIVE
- value: "https://static.crates.io/crates/futures-task/futures-task-0.3.21.crate"
+ value: "https://static.crates.io/crates/futures-task/futures-task-0.3.26.crate"
}
- version: "0.3.21"
+ version: "0.3.26"
license_type: NOTICE
last_upgrade_date {
- year: 2022
- month: 3
- day: 1
+ year: 2023
+ month: 2
+ day: 15
}
}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 64f7c12..d232e61 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -5,47 +5,53 @@
"path": "external/rust/crates/anyhow"
},
{
- "path": "external/rust/crates/futures-util"
+ "path": "external/rust/crates/async-stream"
},
{
- "path": "external/rust/crates/tokio"
+ "path": "external/rust/crates/futures-channel"
},
{
- "path": "external/rust/crates/tokio-test"
- }
- ],
- "presubmit": [
+ "path": "external/rust/crates/futures-executor"
+ },
{
- "name": "ZipFuseTest"
+ "path": "external/rust/crates/futures-test"
},
{
- "name": "authfs_device_test_src_lib"
+ "path": "external/rust/crates/futures-util"
},
{
- "name": "doh_unit_test"
+ "path": "external/rust/crates/tokio"
},
{
- "name": "futures-task_test_src_lib"
+ "path": "external/rust/crates/tokio-test"
},
{
- "name": "virtualizationservice_device_test"
- }
- ],
- "presubmit-rust": [
+ "path": "packages/modules/DnsResolver"
+ },
{
- "name": "ZipFuseTest"
+ "path": "packages/modules/Virtualization/authfs"
},
{
- "name": "authfs_device_test_src_lib"
+ "path": "packages/modules/Virtualization/virtualizationmanager"
},
{
- "name": "doh_unit_test"
+ "path": "packages/modules/Virtualization/zipfuse"
},
{
- "name": "futures-task_test_src_lib"
+ "path": "system/security/keystore2"
},
{
- "name": "virtualizationservice_device_test"
+ "path": "system/security/keystore2/legacykeystore"
+ }
+ ],
+ "presubmit": [
+ {
+ "name": "futures-task_test_src_lib"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "futures-task_test_src_lib"
}
]
}
diff --git a/cargo2android.json b/cargo2android.json
index 5b266a6..b98d10b 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,7 +1,7 @@
{
"apex-available": [
"//apex_available:platform",
- "com.android.bluetooth",
+ "com.android.btservices",
"com.android.resolv",
"com.android.virt"
],
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",
];
diff --git a/src/future_obj.rs b/src/future_obj.rs
index f67494a..071392a 100644
--- a/src/future_obj.rs
+++ b/src/future_obj.rs
@@ -149,6 +149,7 @@ pub unsafe trait UnsafeFutureObj<'a, T>: 'a {
/// provided `*mut (dyn Future<Output = T> + 'a)` into a `Pin<&mut (dyn
/// Future<Output = T> + 'a)>` and call methods on it, non-reentrantly,
/// until `UnsafeFutureObj::drop` is called with it.
+ #[allow(clippy::unnecessary_safety_doc)]
fn into_raw(self) -> *mut (dyn Future<Output = T> + 'a);
/// Drops the future represented by the given fat pointer.
diff --git a/src/waker_ref.rs b/src/waker_ref.rs
index 7fb552f..aac4109 100644
--- a/src/waker_ref.rs
+++ b/src/waker_ref.rs
@@ -18,6 +18,7 @@ pub struct WakerRef<'a> {
impl<'a> WakerRef<'a> {
/// Create a new [`WakerRef`] from a [`Waker`] reference.
+ #[inline]
pub fn new(waker: &'a Waker) -> Self {
// copy the underlying (raw) waker without calling a clone,
// as we won't call Waker::drop either.
@@ -31,6 +32,7 @@ impl<'a> WakerRef<'a> {
/// an unsafe way (that will be valid only for a lifetime to be determined
/// by the caller), and the [`Waker`] doesn't need to or must not be
/// destroyed.
+ #[inline]
pub fn new_unowned(waker: ManuallyDrop<Waker>) -> Self {
Self { waker, _marker: PhantomData }
}
@@ -39,6 +41,7 @@ impl<'a> WakerRef<'a> {
impl Deref for WakerRef<'_> {
type Target = Waker;
+ #[inline]
fn deref(&self) -> &Waker {
&self.waker
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 19:54:56 +0000