diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-10-05 02:28:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-05 02:28:57 +0000 |
| commit | 9b0135423ac2c50e228dd0944cdde604a9238181 (patch) | |
| tree | 26e715644465d45f7f6c55ddf4a1064baa323a85 | |
| parent | 58eb57216e79f38d882e9b60b9dea9577062dc2e (diff) | |
| parent | b4e84aacc0761903238d21cffd5b7743f81b4d19 (diff) | |
| download | futures-channel-9b0135423ac2c50e228dd0944cdde604a9238181.tar.gz | |
Upgrade rust/crates/futures-channel to 0.3.17 am: 60e2aea2c0 am: d65584b07f am: 93b5252009 am: b4e84aacc0
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/1832863
Change-Id: Iadd116c05f9f35c3d97182df5fa27f888a17af39
| -rw-r--r-- | .cargo_vcs_info.json | 2 | ||||
| -rw-r--r-- | Android.bp | 5 | ||||
| -rw-r--r-- | Cargo.toml | 6 | ||||
| -rw-r--r-- | Cargo.toml.orig | 6 | ||||
| -rw-r--r-- | METADATA | 8 |
5 files changed, 13 insertions, 14 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" } } @@ -45,6 +45,8 @@ rust_library { name: "libfutures_channel", host_supported: true, crate_name: "futures_channel", + cargo_env_compat: true, + cargo_pkg_version: "0.3.17", srcs: ["src/lib.rs"], edition: "2018", features: [ @@ -62,6 +64,3 @@ rust_library { ], min_sdk_version: "29", } - -// dependent_library ["feature_list"] -// futures-core-0.3.16 "alloc,std" @@ -12,7 +12,7 @@ [package] edition = "2018" name = "futures-channel" -version = "0.3.16" +version = "0.3.17" authors = ["Alex Crichton <alex@alexcrichton.com>"] description = "Channels for asynchronous communication using futures-rs.\n" homepage = "https://rust-lang.github.io/futures-rs" @@ -23,11 +23,11 @@ repository = "https://github.com/rust-lang/futures-rs" all-features = true rustdoc-args = ["--cfg", "docsrs"] [dependencies.futures-core] -version = "0.3.16" +version = "0.3.17" default-features = false [dependencies.futures-sink] -version = "0.3.16" +version = "0.3.17" optional = true default-features = false diff --git a/Cargo.toml.orig b/Cargo.toml.orig index 1d3cb74..6bd240c 100644 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -1,7 +1,7 @@ [package] name = "futures-channel" 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" @@ -23,8 +23,8 @@ unstable = [] cfg-target-has-atomic = [] [dependencies] -futures-core = { path = "../futures-core", version = "0.3.16", default-features = false } -futures-sink = { path = "../futures-sink", version = "0.3.16", default-features = false, optional = true } +futures-core = { path = "../futures-core", version = "0.3.17", default-features = false } +futures-sink = { path = "../futures-sink", version = "0.3.17", default-features = false, optional = true } [dev-dependencies] futures = { path = "../futures", default-features = true } @@ -7,13 +7,13 @@ third_party { } url { type: ARCHIVE - value: "https://static.crates.io/crates/futures-channel/futures-channel-0.3.16.crate" + value: "https://static.crates.io/crates/futures-channel/futures-channel-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 } } |