From 53a570b0b01e6165ef23897724cceca98e19ca3b Mon Sep 17 00:00:00 2001 From: Orne Brocaar Date: Wed, 29 Nov 2023 14:43:09 +0000 Subject: [PATCH] Update httpmock (dev dep) to 0.7.0-rc.1. This version removes the isahc depencency, which causes openssl to be added as a dependency. Version 0.7 makes this dependency optional. --- Cargo.lock | 114 ++++++------------------------------------ backend/Cargo.toml | 2 +- chirpstack/Cargo.toml | 2 +- 3 files changed, 16 insertions(+), 102 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8a611e06..656b5a41 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -191,6 +191,16 @@ dependencies = [ "serde_json", ] +[[package]] +name = "async-attributes" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5" +dependencies = [ + "quote", + "syn 1.0.109", +] + [[package]] name = "async-channel" version = "1.9.0" @@ -388,6 +398,7 @@ version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" dependencies = [ + "async-attributes", "async-channel 1.9.0", "async-global-executor", "async-io 1.13.0", @@ -703,12 +714,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" -[[package]] -name = "castaway" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" - [[package]] name = "cbc" version = "0.1.2" @@ -1067,37 +1072,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "curl" -version = "0.4.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22" -dependencies = [ - "curl-sys", - "libc", - "openssl-probe", - "openssl-sys", - "schannel", - "socket2 0.4.10", - "winapi", -] - -[[package]] -name = "curl-sys" -version = "0.4.68+curl-8.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4a0d18d88360e374b16b2273c832b5e57258ffc1d4aa4f96b108e0738d5752f" -dependencies = [ - "cc", - "libc", - "libnghttp2-sys", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", - "windows-sys", -] - [[package]] name = "curve25519-dalek" version = "4.1.1" @@ -1997,12 +1971,13 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "httpmock" -version = "0.6.8" +version = "0.7.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b02e044d3b4c2f94936fb05f9649efa658ca788f44eb6b87554e2033fc8ce93" +checksum = "729baafac5c497d67ee98569d7bb95a77cb6cd0a8aecda7b8a1a2bed45fd01d2" dependencies = [ "assert-json-diff", "async-object-pool", + "async-std", "async-trait", "base64 0.21.5", "basic-cookies", @@ -2010,7 +1985,6 @@ dependencies = [ "form_urlencoded", "futures-util", "hyper", - "isahc", "lazy_static", "levenshtein", "log", @@ -2208,33 +2182,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "isahc" -version = "1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "334e04b4d781f436dc315cb1e7515bd96826426345d498149e4bde36b67f8ee9" -dependencies = [ - "async-channel 1.9.0", - "castaway", - "crossbeam-utils", - "curl", - "curl-sys", - "encoding_rs", - "event-listener 2.5.3", - "futures-lite 1.13.0", - "http", - "log", - "mime", - "once_cell", - "polling 2.8.0", - "slab", - "sluice", - "tracing", - "tracing-futures", - "url", - "waker-fn", -] - [[package]] name = "itertools" version = "0.10.5" @@ -2387,16 +2334,6 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" -[[package]] -name = "libnghttp2-sys" -version = "0.1.8+1.55.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fae956c192dadcdb5dace96db71fa0b827333cce7c7b38dc71446f024d8a340" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "libredox" version = "0.0.1" @@ -2408,18 +2345,6 @@ dependencies = [ "redox_syscall", ] -[[package]] -name = "libz-sys" -version = "1.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - [[package]] name = "linux-raw-sys" version = "0.3.8" @@ -4155,17 +4080,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "sluice" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5" -dependencies = [ - "async-channel 1.9.0", - "futures-core", - "futures-io", -] - [[package]] name = "smallvec" version = "1.11.2" diff --git a/backend/Cargo.toml b/backend/Cargo.toml index e99d7266..97a3b573 100644 --- a/backend/Cargo.toml +++ b/backend/Cargo.toml @@ -21,4 +21,4 @@ chirpstack_api = { path = "../api/rust", default-features = false, features = [" # Development and testing [dev-dependencies] -httpmock = "0.6" +httpmock = "0.7.0-rc.1" diff --git a/chirpstack/Cargo.toml b/chirpstack/Cargo.toml index 9de3109d..7d9d70c4 100644 --- a/chirpstack/Cargo.toml +++ b/chirpstack/Cargo.toml @@ -136,7 +136,7 @@ pin-project = "1.1" # Development and testing [dev-dependencies] -httpmock = "0.6" +httpmock = "0.7.0-rc.1" bytes = "1.4" dotenv = "0.15"