From 5cc3040bd829b701f84bb521ba297c93567ffa2d Mon Sep 17 00:00:00 2001 From: Roderick van Domburg Date: Sat, 8 Jan 2022 21:21:31 +0100 Subject: [PATCH] Update `futures` --- Cargo.lock | 55 +++++++++++++++------------------------------ audio/Cargo.toml | 7 +++--- connect/Cargo.toml | 2 +- core/Cargo.toml | 4 ++-- metadata/Cargo.toml | 2 +- playback/Cargo.toml | 3 +-- protocol/Cargo.toml | 2 +- 7 files changed, 27 insertions(+), 48 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b2082f9d..1b61cf71 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -474,9 +474,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.17" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12aa0eb539080d55c3f2d45a67c3b58b6b0773c1a3ca2dfec66d58c97fd66ca" +checksum = "28560757fe2bb34e79f907794bb6b22ae8b0e5c669b638a1132f2592b19035b4" dependencies = [ "futures-channel", "futures-core", @@ -489,9 +489,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.17" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888" +checksum = "ba3dda0b6588335f360afc675d0564c17a77a2bda81ca178a4b6081bd86c7f0b" dependencies = [ "futures-core", "futures-sink", @@ -499,15 +499,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.17" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d" +checksum = "d0c8ff0461b82559810cdccfde3215c3f373807f5e5232b71479bff7bb2583d7" [[package]] name = "futures-executor" -version = "0.3.17" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45025be030969d763025784f7f355043dc6bc74093e4ecc5000ca4dc50d8745c" +checksum = "29d6d2ff5bb10fb95c85b8ce46538a2e5f5e7fdc755623a7d4529ab8a4ed9d2a" dependencies = [ "futures-core", "futures-task", @@ -516,18 +516,16 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.17" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377" +checksum = "b1f9d34af5a1aac6fb380f735fe510746c38067c5bf16c7fd250280503c971b2" [[package]] name = "futures-macro" -version = "0.3.17" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb" +checksum = "6dbd947adfffb0efc70599b3ddcf7b5597bb5fa9e245eb99f62b3a5f7bb8bd3c" dependencies = [ - "autocfg", - "proc-macro-hack", "proc-macro2", "quote", "syn", @@ -535,23 +533,22 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.17" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11" +checksum = "e3055baccb68d74ff6480350f8d6eb8fcfa3aa11bdc1a1ae3afdd0514617d508" [[package]] name = "futures-task" -version = "0.3.17" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99" +checksum = "6ee7c6485c30167ce4dfb83ac568a849fe53274c831081476ee13e0dce1aad72" [[package]] name = "futures-util" -version = "0.3.17" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481" +checksum = "d9b5cf40b47a271f77a8b1bec03ca09044d99d2372c0de244e66430761127164" dependencies = [ - "autocfg", "futures-channel", "futures-core", "futures-io", @@ -561,8 +558,6 @@ dependencies = [ "memchr", "pin-project-lite", "pin-utils", - "proc-macro-hack", - "proc-macro-nested", "slab", ] @@ -1243,7 +1238,6 @@ dependencies = [ "byteorder", "bytes", "futures-core", - "futures-executor", "futures-util", "hyper", "librespot-core", @@ -1371,7 +1365,6 @@ dependencies = [ "alsa", "byteorder", "cpal", - "futures-executor", "futures-util", "glib", "gstreamer", @@ -1988,18 +1981,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - -[[package]] -name = "proc-macro-nested" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" - [[package]] name = "proc-macro2" version = "1.0.33" diff --git a/audio/Cargo.toml b/audio/Cargo.toml index 3f220929..3df80c77 100644 --- a/audio/Cargo.toml +++ b/audio/Cargo.toml @@ -13,10 +13,9 @@ version = "0.3.1" [dependencies] aes = { version = "0.7", features = ["ctr"] } byteorder = "1.4" -bytes = "1.0" -futures-core = { version = "0.3", default-features = false } -futures-executor = "0.3" -futures-util = { version = "0.3", default_features = false } +bytes = "1" +futures-core = "0.3" +futures-util = "0.3" hyper = { version = "0.14", features = ["client"] } log = "0.4" parking_lot = { version = "0.11", features = ["deadlock_detection"] } diff --git a/connect/Cargo.toml b/connect/Cargo.toml index 37521df9..5a7edb27 100644 --- a/connect/Cargo.toml +++ b/connect/Cargo.toml @@ -9,7 +9,7 @@ edition = "2018" [dependencies] form_urlencoded = "1.0" -futures-util = { version = "0.3.5", default_features = false } +futures-util = "0.3" log = "0.4" protobuf = "2.14.0" rand = "0.8" diff --git a/core/Cargo.toml b/core/Cargo.toml index 6822a8ba..afbbdb98 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -20,8 +20,8 @@ bytes = "1" chrono = "0.4" dns-sd = { version = "0.1.3", optional = true } form_urlencoded = "1.0" -futures-core = { version = "0.3", default-features = false } -futures-util = { version = "0.3", default-features = false, features = ["alloc", "bilock", "sink", "unstable"] } +futures-core = "0.3" +futures-util = { version = "0.3", features = ["alloc", "bilock", "sink", "unstable"] } hmac = "0.11" httparse = "1.3" http = "0.2" diff --git a/metadata/Cargo.toml b/metadata/Cargo.toml index c9f108d6..1dd2c702 100644 --- a/metadata/Cargo.toml +++ b/metadata/Cargo.toml @@ -10,7 +10,7 @@ edition = "2018" [dependencies] async-trait = "0.1" byteorder = "1.3" -bytes = "1.0" +bytes = "1" chrono = "0.4" log = "0.4" protobuf = "2.14.0" diff --git a/playback/Cargo.toml b/playback/Cargo.toml index 262312c0..514d4425 100644 --- a/playback/Cargo.toml +++ b/playback/Cargo.toml @@ -19,8 +19,7 @@ version = "0.3.1" [dependencies] byteorder = "1.4" -futures-executor = "0.3" -futures-util = { version = "0.3", default_features = false, features = ["alloc"] } +futures-util = "0.3" log = "0.4" parking_lot = { version = "0.11", features = ["deadlock_detection"] } shell-words = "1.0.0" diff --git a/protocol/Cargo.toml b/protocol/Cargo.toml index 5e24f288..a67a1604 100644 --- a/protocol/Cargo.toml +++ b/protocol/Cargo.toml @@ -12,5 +12,5 @@ edition = "2018" protobuf = "2.25" [build-dependencies] -protobuf-codegen-pure = "2.25" glob = "0.3.0" +protobuf-codegen-pure = "2.25"