Snap for 9900366 from 339f9d59d88616a7166db46b78625f3011e39d96 to udc-beta2-release

Change-Id: If2cd2b968742dd2175a6af0dae0fa06199cb2b4a

7 files changed, 38 insertions, 29 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..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.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: [
@@ -76,5 +76,7 @@ rust_library {
         "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 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/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/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.