From 8bb500e566642556f1db45965953502b667daf21 Mon Sep 17 00:00:00 2001 From: David Brazdil Date: Mon, 23 Jan 2023 13:34:24 +0000 Subject: Update TEST_MAPPING Test: None Change-Id: I8bdf77bd77c68793cb489e803f6ee271348dcd3a --- TEST_MAPPING | 46 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/TEST_MAPPING b/TEST_MAPPING index 64f7c12..e50f576 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -4,6 +4,18 @@ { "path": "external/rust/crates/anyhow" }, + { + "path": "external/rust/crates/async-stream" + }, + { + "path": "external/rust/crates/futures-channel" + }, + { + "path": "external/rust/crates/futures-executor" + }, + { + "path": "external/rust/crates/futures-test" + }, { "path": "external/rust/crates/futures-util" }, @@ -21,6 +33,9 @@ { "name": "authfs_device_test_src_lib" }, + { + "name": "bluetooth_with_facades.test" + }, { "name": "doh_unit_test" }, @@ -28,7 +43,19 @@ "name": "futures-task_test_src_lib" }, { - "name": "virtualizationservice_device_test" + "name": "keystore2_legacy_blobs_test" + }, + { + "name": "keystore2_test" + }, + { + "name": "legacykeystore_test" + }, + { + "name": "libpvmfw_avb.integration_test" + }, + { + "name": "virtualizationmanager_device_test" } ], "presubmit-rust": [ @@ -38,6 +65,9 @@ { "name": "authfs_device_test_src_lib" }, + { + "name": "bluetooth_with_facades.test" + }, { "name": "doh_unit_test" }, @@ -45,7 +75,19 @@ "name": "futures-task_test_src_lib" }, { - "name": "virtualizationservice_device_test" + "name": "keystore2_legacy_blobs_test" + }, + { + "name": "keystore2_test" + }, + { + "name": "legacykeystore_test" + }, + { + "name": "libpvmfw_avb.integration_test" + }, + { + "name": "virtualizationmanager_device_test" } ] } -- cgit v1.2.3 From d54f8c7eafb33cae50274a3c7b29c9a56787b463 Mon Sep 17 00:00:00 2001 From: Jeff Vander Stoep Date: Mon, 30 Jan 2023 11:36:00 +0100 Subject: Update TEST_MAPPING Test: atest Change-Id: I27862015218c66aaab9f53df0dbab5b85bfc2312 --- TEST_MAPPING | 56 ++++++++++---------------------------------------------- 1 file changed, 10 insertions(+), 46 deletions(-) diff --git a/TEST_MAPPING b/TEST_MAPPING index e50f576..d232e61 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -24,70 +24,34 @@ }, { "path": "external/rust/crates/tokio-test" - } - ], - "presubmit": [ - { - "name": "ZipFuseTest" - }, - { - "name": "authfs_device_test_src_lib" - }, - { - "name": "bluetooth_with_facades.test" }, { - "name": "doh_unit_test" + "path": "packages/modules/DnsResolver" }, { - "name": "futures-task_test_src_lib" + "path": "packages/modules/Virtualization/authfs" }, { - "name": "keystore2_legacy_blobs_test" + "path": "packages/modules/Virtualization/virtualizationmanager" }, { - "name": "keystore2_test" + "path": "packages/modules/Virtualization/zipfuse" }, { - "name": "legacykeystore_test" + "path": "system/security/keystore2" }, { - "name": "libpvmfw_avb.integration_test" - }, + "path": "system/security/keystore2/legacykeystore" + } + ], + "presubmit": [ { - "name": "virtualizationmanager_device_test" + "name": "futures-task_test_src_lib" } ], "presubmit-rust": [ - { - "name": "ZipFuseTest" - }, - { - "name": "authfs_device_test_src_lib" - }, - { - "name": "bluetooth_with_facades.test" - }, - { - "name": "doh_unit_test" - }, { "name": "futures-task_test_src_lib" - }, - { - "name": "keystore2_legacy_blobs_test" - }, - { - "name": "keystore2_test" - }, - { - "name": "legacykeystore_test" - }, - { - "name": "libpvmfw_avb.integration_test" - }, - { - "name": "virtualizationmanager_device_test" } ] } -- cgit v1.2.3 From c35ebc846a44c7d05192d9537ea037ed46c29591 Mon Sep 17 00:00:00 2001 From: Jeff Vander Stoep Date: Wed, 15 Feb 2023 20:22:08 +0100 Subject: Upgrade futures-task to 0.3.26 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 Test: TreeHugger Change-Id: I75a668fe6a8b7313da203b2aac6c58a927f4277b --- .cargo_vcs_info.json | 2 +- Android.bp | 4 ++-- Cargo.toml | 2 +- Cargo.toml.orig | 2 +- METADATA | 10 +++++----- src/future_obj.rs | 1 + 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json index 37a6038..40cce12 100644 --- a/.cargo_vcs_info.json +++ b/.cargo_vcs_info.json @@ -1,6 +1,6 @@ { "git": { - "sha1": "77d82198c5afd04af3e760a6aa50b7e875289fc3" + "sha1": "5e3693a350f96244151081d2c030208cd15f9572" }, "path_in_vcs": "futures-task" } \ No newline at end of file diff --git a/Android.bp b/Android.bp index a316e1b..3d65b55 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.25", + 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.25", + cargo_pkg_version: "0.3.26", srcs: ["src/lib.rs"], edition: "2018", features: [ diff --git a/Cargo.toml b/Cargo.toml index 0b31fc3..27a63b0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ edition = "2018" rust-version = "1.45" name = "futures-task" -version = "0.3.25" +version = "0.3.26" description = """ Tools for working with tasks. """ diff --git a/Cargo.toml.orig b/Cargo.toml.orig index 67af1cc..4c2d1df 100644 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -1,6 +1,6 @@ [package] name = "futures-task" -version = "0.3.25" +version = "0.3.26" edition = "2018" rust-version = "1.45" license = "MIT OR Apache-2.0" diff --git a/METADATA b/METADATA index 3558087..4068190 100644 --- a/METADATA +++ b/METADATA @@ -11,13 +11,13 @@ third_party { } url { type: ARCHIVE - value: "https://static.crates.io/crates/futures-task/futures-task-0.3.25.crate" + value: "https://static.crates.io/crates/futures-task/futures-task-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/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 + 'a)` into a `Pin<&mut (dyn /// Future + '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 + 'a); /// Drops the future represented by the given fat pointer. -- cgit v1.2.3 From 897fa1c9b455a1e5fe29f7ddf675b8d688ced870 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 7 Mar 2023 17:23:55 -0800 Subject: Make futures-task available to product and vendor Bug: 270690570 Test: mma in external/rust/crates Change-Id: I64d5203177e3e50227380ba45da0d9022c5a0186 --- Android.bp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Android.bp b/Android.bp index 3d65b55..fa41b4f 100644 --- a/Android.bp +++ b/Android.bp @@ -76,5 +76,7 @@ rust_library { "com.android.resolv", "com.android.virt", ], + product_available: true, + vendor_available: true, min_sdk_version: "29", } -- cgit v1.2.3