diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-10-12 17:00:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-12 17:00:21 +0000 |
| commit | 1e8175c22013e40b1d522cdeffd464844451c953 (patch) | |
| tree | 3ecde6f75a4678a7f191c0e9d7a0bc2acc2f2ada | |
| parent | 5311f1f5d3b498cbf54c0fd5f89b500ba80edf8d (diff) | |
| parent | c363c14324228c7af4af67843e685c14ade5ca61 (diff) | |
| download | futures-task-1e8175c22013e40b1d522cdeffd464844451c953.tar.gz | |
Merge "Upgrade rust/crates/futures-task to 0.3.17" am: fb6d77547c am: 700b1d96ee am: c363c14324
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-task/+/1832967
Change-Id: I474b3057af728b6b86c9c8fbb4dc5e1a007b203d
| -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 | 8 |
5 files changed, 11 insertions, 7 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json index 99dc8b0..ffd4f55 100644 --- a/.cargo_vcs_info.json +++ b/.cargo_vcs_info.json @@ -1,5 +1,5 @@ { "git": { - "sha1": "ab38fd29d3f84f8fc028fa7883e53dba423da0ee" + "sha1": "7caefa51304e78fd5018cd5d2a03f3b9089cc010" } } @@ -41,6 +41,8 @@ rust_defaults { name: "futures-task_test_defaults", crate_name: "futures_task", srcs: ["src/lib.rs"], + cargo_env_compat: true, + cargo_pkg_version: "0.3.17", test_suites: ["general-tests"], auto_gen_config: true, edition: "2018", @@ -68,6 +70,8 @@ rust_library { name: "libfutures_task", host_supported: true, crate_name: "futures_task", + cargo_env_compat: true, + cargo_pkg_version: "0.3.17", srcs: ["src/lib.rs"], edition: "2018", features: [ @@ -12,7 +12,7 @@ [package] edition = "2018" name = "futures-task" -version = "0.3.16" +version = "0.3.17" authors = ["Alex Crichton <alex@alexcrichton.com>"] description = "Tools for working with tasks.\n" homepage = "https://rust-lang.github.io/futures-rs" diff --git a/Cargo.toml.orig b/Cargo.toml.orig index 3d246ad..23e5aed 100644 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -1,7 +1,7 @@ [package] name = "futures-task" edition = "2018" -version = "0.3.16" +version = "0.3.17" authors = ["Alex Crichton <alex@alexcrichton.com>"] license = "MIT OR Apache-2.0" repository = "https://github.com/rust-lang/futures-rs" @@ -7,13 +7,13 @@ third_party { } url { type: ARCHIVE - value: "https://static.crates.io/crates/futures-task/futures-task-0.3.16.crate" + value: "https://static.crates.io/crates/futures-task/futures-task-0.3.17.crate" } - version: "0.3.16" + version: "0.3.17" license_type: NOTICE last_upgrade_date { year: 2021 - month: 8 - day: 9 + month: 9 + day: 22 } } |