diff options
| author | Jeff Vander Stoep <jeffv@google.com> | 2023-02-16 09:45:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-02-16 09:45:48 +0000 |
| commit | 46a743cb2f5713bc65657613307ed3480fa980e4 (patch) | |
| tree | 511a6477d9782c1cfcedd15b35ceff99acd44efa | |
| parent | d776772a115160b806c37981ff9645e2ad3ae575 (diff) | |
| parent | 1af26e18f6319b107eeb40df2942cb198f2c778f (diff) | |
| download | futures-task-46a743cb2f5713bc65657613307ed3480fa980e4.tar.gz | |
Upgrade futures-task to 0.3.26 am: c35ebc846a am: 1af26e18f6
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-task/+/2438875
Change-Id: Ibccf3c120b33f600e452d80e15a0f27e0b6621c1
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 | 4 | ||||
| -rw-r--r-- | Cargo.toml | 2 | ||||
| -rw-r--r-- | Cargo.toml.orig | 2 | ||||
| -rw-r--r-- | METADATA | 10 | ||||
| -rw-r--r-- | 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 @@ -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: [ @@ -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" @@ -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<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. |