From 5a9039951ab9b38ee41b582e885ad4f4b07b5a4c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 27 Sep 2025 05:33:44 +0000 Subject: [PATCH 1/2] chore(deps): Bump httpmock from 0.7.0 to 0.8.0 Bumps [httpmock](https://github.com/httpmock/httpmock) from 0.7.0 to 0.8.0. - [Release notes](https://github.com/httpmock/httpmock/releases) - [Changelog](https://github.com/httpmock/httpmock/blob/master/CHANGELOG.md) - [Commits](https://github.com/httpmock/httpmock/compare/v0.7.0...v0.8.0) --- updated-dependencies: - dependency-name: httpmock dependency-version: 0.8.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 685 +++++++-------------------------------- openstack_sdk/Cargo.toml | 2 +- 2 files changed, 117 insertions(+), 570 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c03c4ba6c..227914d5d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -109,15 +109,6 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236" -[[package]] -name = "ascii-canvas" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" -dependencies = [ - "term", -] - [[package]] name = "asn1-rs" version = "0.6.2" @@ -183,168 +174,25 @@ dependencies = [ "wait-timeout", ] -[[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" -dependencies = [ - "concurrent-queue", - "event-listener 2.5.3", - "futures-core", -] - -[[package]] -name = "async-channel" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2" -dependencies = [ - "concurrent-queue", - "event-listener-strategy", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-executor" -version = "1.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497c00e0fd83a72a79a39fcbd8e3e2f055d6f6c7e025f3b3d91f4f8e76527fb8" -dependencies = [ - "async-task", - "concurrent-queue", - "fastrand", - "futures-lite", - "pin-project-lite", - "slab", -] - -[[package]] -name = "async-global-executor" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" -dependencies = [ - "async-channel 2.5.0", - "async-executor", - "async-io", - "async-lock", - "blocking", - "futures-lite", - "once_cell", -] - -[[package]] -name = "async-io" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456b8a8feb6f42d237746d4b3e9a178494627745c3c56c6ea55d92ba50d026fc" -dependencies = [ - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-io", - "futures-lite", - "parking", - "polling", - "rustix 1.1.2", - "slab", - "windows-sys 0.61.0", -] - [[package]] name = "async-lock" version = "3.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5fd03604047cee9b6ce9de9f70c6cd540a0520c813cbd49bae61f33ab80ed1dc" dependencies = [ - "event-listener 5.4.1", + "event-listener", "event-listener-strategy", "pin-project-lite", ] [[package]] name = "async-object-pool" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "333c456b97c3f2d50604e8b2624253b7f787208cb72eb75e64b0ad11b221652c" -dependencies = [ - "async-std", -] - -[[package]] -name = "async-process" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc50921ec0055cdd8a16de48773bfeec5c972598674347252c0399676be7da75" -dependencies = [ - "async-channel 2.5.0", - "async-io", - "async-lock", - "async-signal", - "async-task", - "blocking", - "cfg-if", - "event-listener 5.4.1", - "futures-lite", - "rustix 1.1.2", -] - -[[package]] -name = "async-signal" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43c070bbf59cd3570b6b2dd54cd772527c7c3620fce8be898406dd3ed6adc64c" -dependencies = [ - "async-io", - "async-lock", - "atomic-waker", - "cfg-if", - "futures-core", - "futures-io", - "rustix 1.1.2", - "signal-hook-registry", - "slab", - "windows-sys 0.61.0", -] - -[[package]] -name = "async-std" -version = "1.13.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c8e079a4ab67ae52b7403632e4618815d6db36d2a010cfe41b02c1b1578f93b" +checksum = "e1ac0219111eb7bb7cb76d4cf2cb50c598e7ae549091d3616f9e95442c18486f" dependencies = [ - "async-attributes", - "async-channel 1.9.0", - "async-global-executor", - "async-io", "async-lock", - "async-process", - "crossbeam-utils", - "futures-channel", - "futures-core", - "futures-io", - "futures-lite", - "gloo-timers", - "kv-log-macro", - "log", - "memchr", - "once_cell", - "pin-project-lite", - "pin-utils", - "slab", - "wasm-bindgen-futures", + "event-listener", ] [[package]] @@ -369,12 +217,6 @@ dependencies = [ "syn 2.0.106", ] -[[package]] -name = "async-task" -version = "4.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" - [[package]] name = "async-trait" version = "0.1.89" @@ -463,17 +305,6 @@ dependencies = [ "serde", ] -[[package]] -name = "basic-cookies" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67bd8fd42c16bdb08688243dc5f0cc117a3ca9efeeaba3a345a18a6159ad96f7" -dependencies = [ - "lalrpop", - "lalrpop-util", - "regex", -] - [[package]] name = "bincode" version = "2.0.1" @@ -484,21 +315,6 @@ dependencies = [ "unty", ] -[[package]] -name = "bit-set" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - [[package]] name = "bitflags" version = "1.3.2" @@ -523,19 +339,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "blocking" -version = "1.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e83f8d02be6967315521be875afa792a316e28d57b5a2d401897e2a7921b7f21" -dependencies = [ - "async-channel 2.5.0", - "async-task", - "futures-io", - "futures-lite", - "piper", -] - [[package]] name = "bstr" version = "1.12.0" @@ -558,6 +361,9 @@ name = "bytes" version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" +dependencies = [ + "serde", +] [[package]] name = "cassowary" @@ -844,12 +650,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "crunchy" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" - [[package]] name = "crypto-common" version = "0.1.6" @@ -1076,16 +876,6 @@ dependencies = [ "dirs-sys", ] -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if", - "dirs-sys-next", -] - [[package]] name = "dirs-sys" version = "0.5.0" @@ -1094,21 +884,10 @@ checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab" dependencies = [ "libc", "option-ext", - "redox_users 0.5.2", + "redox_users", "windows-sys 0.61.0", ] -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users 0.4.6", - "winapi", -] - [[package]] name = "displaydoc" version = "0.2.5" @@ -1141,15 +920,6 @@ version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" -[[package]] -name = "ena" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d248bdd43ce613d87415282f69b9bb99d947d290b10962dd6c56233312c2ad5" -dependencies = [ - "log", -] - [[package]] name = "encode_unicode" version = "1.0.0" @@ -1215,12 +985,6 @@ dependencies = [ "windows-sys 0.61.0", ] -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - [[package]] name = "event-listener" version = "5.4.1" @@ -1238,7 +1002,7 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93" dependencies = [ - "event-listener 5.4.1", + "event-listener", "pin-project-lite", ] @@ -1270,12 +1034,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ced73b1dacfc750a6db6c0a0c3a3853c8b41997e2e2c563dc90804ae6867959" -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - [[package]] name = "fnv" version = "1.0.7" @@ -1360,19 +1118,6 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" -[[package]] -name = "futures-lite" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad" -dependencies = [ - "fastrand", - "futures-core", - "futures-io", - "parking", - "pin-project-lite", -] - [[package]] name = "futures-macro" version = "0.3.31" @@ -1396,6 +1141,12 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" +[[package]] +name = "futures-timer" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" + [[package]] name = "futures-util" version = "0.3.31" @@ -1466,18 +1217,6 @@ version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" -[[package]] -name = "gloo-timers" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" -dependencies = [ - "futures-channel", - "futures-core", - "js-sys", - "wasm-bindgen", -] - [[package]] name = "h2" version = "0.4.12" @@ -1489,7 +1228,7 @@ dependencies = [ "fnv", "futures-core", "futures-sink", - "http 1.3.1", + "http", "indexmap", "slab", "tokio", @@ -1545,6 +1284,30 @@ dependencies = [ "hashbrown 0.15.5", ] +[[package]] +name = "headers" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3314d5adb5d94bcdf56771f2e50dbbc80bb4bdf88967526706205ac9eff24eb" +dependencies = [ + "base64 0.22.1", + "bytes", + "headers-core", + "http", + "httpdate", + "mime", + "sha1", +] + +[[package]] +name = "headers-core" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4" +dependencies = [ + "http", +] + [[package]] name = "heck" version = "0.5.0" @@ -1563,17 +1326,6 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -[[package]] -name = "http" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - [[package]] name = "http" version = "1.3.1" @@ -1585,17 +1337,6 @@ dependencies = [ "itoa", ] -[[package]] -name = "http-body" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" -dependencies = [ - "bytes", - "http 0.2.12", - "pin-project-lite", -] - [[package]] name = "http-body" version = "1.0.1" @@ -1603,7 +1344,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http 1.3.1", + "http", ] [[package]] @@ -1614,8 +1355,8 @@ checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" dependencies = [ "bytes", "futures-core", - "http 1.3.1", - "http-body 1.0.1", + "http", + "http-body", "pin-project-lite", ] @@ -1633,53 +1374,36 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "httpmock" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08ec9586ee0910472dec1a1f0f8acf52f0fdde93aea74d70d4a3107b4be0fd5b" +checksum = "1cccf7d3f1b6ee94515933ed2d24615bc8aa2a68c3858e318422f10f538888f2" dependencies = [ "assert-json-diff", "async-object-pool", - "async-std", "async-trait", - "base64 0.21.7", - "basic-cookies", + "base64 0.22.1", + "bytes", "crossbeam-utils", "form_urlencoded", + "futures-timer", "futures-util", - "hyper 0.14.32", - "lazy_static", - "levenshtein", - "log", + "headers", + "http", + "http-body-util", + "hyper", + "hyper-util", + "path-tree", "regex", "serde", "serde_json", "serde_regex", "similar", + "stringmetrics", + "tabwriter", + "thiserror 2.0.16", "tokio", - "url", -] - -[[package]] -name = "hyper" -version = "0.14.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "http 0.2.12", - "http-body 0.4.6", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2 0.5.10", - "tokio", - "tower-service", "tracing", - "want", + "url", ] [[package]] @@ -1693,8 +1417,8 @@ dependencies = [ "futures-channel", "futures-core", "h2", - "http 1.3.1", - "http-body 1.0.1", + "http", + "http-body", "httparse", "httpdate", "itoa", @@ -1711,8 +1435,8 @@ version = "0.27.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" dependencies = [ - "http 1.3.1", - "hyper 1.7.0", + "http", + "hyper", "hyper-util", "rustls", "rustls-pki-types", @@ -1733,14 +1457,14 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "http 1.3.1", - "http-body 1.0.1", - "hyper 1.7.0", + "http", + "http-body", + "hyper", "ipnet", "libc", "percent-encoding", "pin-project-lite", - "socket2 0.6.0", + "socket2", "system-configuration", "tokio", "tower-service", @@ -2002,15 +1726,6 @@ version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" -[[package]] -name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.13.0" @@ -2112,58 +1827,12 @@ dependencies = [ "serde_json", ] -[[package]] -name = "kv-log-macro" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" -dependencies = [ - "log", -] - -[[package]] -name = "lalrpop" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cb077ad656299f160924eb2912aa147d7339ea7d69e1b5517326fdcec3c1ca" -dependencies = [ - "ascii-canvas", - "bit-set", - "ena", - "itertools 0.11.0", - "lalrpop-util", - "petgraph", - "pico-args", - "regex", - "regex-syntax", - "string_cache", - "term", - "tiny-keccak", - "unicode-xid", - "walkdir", -] - -[[package]] -name = "lalrpop-util" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553" -dependencies = [ - "regex-automata", -] - [[package]] name = "lazy_static" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -[[package]] -name = "levenshtein" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760" - [[package]] name = "libc" version = "0.2.175" @@ -2249,9 +1918,6 @@ name = "log" version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" -dependencies = [ - "value-bag", -] [[package]] name = "lru" @@ -2319,6 +1985,12 @@ dependencies = [ "autocfg", ] +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -2346,12 +2018,6 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "new_debug_unreachable" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" - [[package]] name = "nom" version = "7.1.3" @@ -2547,7 +2213,7 @@ dependencies = [ "dirs", "eyre", "file_diff", - "http 1.3.1", + "http", "indicatif", "itertools 0.14.0", "json-patch", @@ -2588,10 +2254,10 @@ dependencies = [ "form_urlencoded", "futures", "futures-util", - "http 1.3.1", + "http", "http-body-util", "httpmock", - "hyper 1.7.0", + "hyper", "hyper-util", "itertools 0.14.0", "json-patch", @@ -2735,6 +2401,15 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35fb2e5f958ec131621fdd531e9fc186ed768cbe395337403ae56c17a74c68ec" +[[package]] +name = "path-tree" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2a97453bc21a968f722df730bfe11bd08745cb50d1300b0df2bda131dece136" +dependencies = [ + "smallvec", +] + [[package]] name = "pathdiff" version = "0.2.3" @@ -2791,31 +2466,6 @@ dependencies = [ "sha2", ] -[[package]] -name = "petgraph" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" -dependencies = [ - "fixedbitset", - "indexmap", -] - -[[package]] -name = "phf_shared" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pico-args" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" - [[package]] name = "pin-project-lite" version = "0.2.16" @@ -2828,37 +2478,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "piper" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" -dependencies = [ - "atomic-waker", - "fastrand", - "futures-io", -] - [[package]] name = "pkg-config" version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" -[[package]] -name = "polling" -version = "3.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0e4f59085d47d8241c88ead0f274e8a0cb551f3625263c05eb8dd897c34218" -dependencies = [ - "cfg-if", - "concurrent-queue", - "hermit-abi", - "pin-project-lite", - "rustix 1.1.2", - "windows-sys 0.61.0", -] - [[package]] name = "portable-atomic" version = "1.11.1" @@ -2898,12 +2523,6 @@ dependencies = [ "zerocopy", ] -[[package]] -name = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - [[package]] name = "predicates" version = "3.1.3" @@ -2981,7 +2600,7 @@ dependencies = [ "quinn-udp", "rustc-hash", "rustls", - "socket2 0.6.0", + "socket2", "thiserror 2.0.16", "tokio", "tracing", @@ -3018,7 +2637,7 @@ dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2 0.6.0", + "socket2", "tracing", "windows-sys 0.60.2", ] @@ -3128,17 +2747,6 @@ dependencies = [ "bitflags 2.9.4", ] -[[package]] -name = "redox_users" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" -dependencies = [ - "getrandom 0.2.16", - "libredox", - "thiserror 1.0.69", -] - [[package]] name = "redox_users" version = "0.5.2" @@ -3190,10 +2798,10 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "http 1.3.1", - "http-body 1.0.1", + "http", + "http-body", "http-body-util", - "hyper 1.7.0", + "hyper", "hyper-rustls", "hyper-util", "js-sys", @@ -3354,15 +2962,6 @@ version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - [[package]] name = "scopeguard" version = "1.2.0" @@ -3505,6 +3104,17 @@ dependencies = [ "unsafe-libyaml", ] +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + [[package]] name = "sha2" version = "0.10.9" @@ -3573,12 +3183,6 @@ version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbbb5d9659141646ae647b42fe094daf6c6192d1620870b449d9557f748b2daa" -[[package]] -name = "siphasher" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" - [[package]] name = "slab" version = "0.4.11" @@ -3591,16 +3195,6 @@ version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" -[[package]] -name = "socket2" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - [[package]] name = "socket2" version = "0.6.0" @@ -3624,16 +3218,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] -name = "string_cache" -version = "0.8.9" +name = "stringmetrics" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf776ba3fa74f83bf4b63c3dcbbf82173db2632ed8452cb2d891d33f459de70f" -dependencies = [ - "new_debug_unreachable", - "parking_lot", - "phf_shared", - "precomputed-hash", -] +checksum = "7b3c8667cd96245cbb600b8dec5680a7319edd719c5aa2b5d23c6bff94f39765" [[package]] name = "strip-ansi-escapes" @@ -3803,6 +3391,15 @@ dependencies = [ "libc", ] +[[package]] +name = "tabwriter" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fce91f2f0ec87dff7e6bcbbeb267439aa1188703003c6055193c821487400432" +dependencies = [ + "unicode-width 0.2.0", +] + [[package]] name = "tempfile" version = "3.23.0" @@ -3816,17 +3413,6 @@ dependencies = [ "windows-sys 0.61.0", ] -[[package]] -name = "term" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" -dependencies = [ - "dirs-next", - "rustversion", - "winapi", -] - [[package]] name = "terminal_size" version = "0.4.3" @@ -3923,15 +3509,6 @@ dependencies = [ "time-core", ] -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - [[package]] name = "tinystr" version = "0.8.1" @@ -3971,7 +3548,7 @@ dependencies = [ "pin-project-lite", "signal-hook-registry", "slab", - "socket2 0.6.0", + "socket2", "tokio-macros", "windows-sys 0.59.0", ] @@ -4062,8 +3639,8 @@ dependencies = [ "bitflags 2.9.4", "bytes", "futures-util", - "http 1.3.1", - "http-body 1.0.1", + "http", + "http-body", "iri-string", "pin-project-lite", "tower", @@ -4089,6 +3666,7 @@ version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ + "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -4250,12 +3828,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" -[[package]] -name = "unicode-xid" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" - [[package]] name = "unit-prefix" version = "0.5.1" @@ -4322,12 +3894,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" -[[package]] -name = "value-bag" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "943ce29a8a743eb10d6082545d861b24f9d1b160b7d741e0f2cdf726bec909c5" - [[package]] name = "vcpkg" version = "0.2.15" @@ -4358,16 +3924,6 @@ dependencies = [ "libc", ] -[[package]] -name = "walkdir" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" -dependencies = [ - "same-file", - "winapi-util", -] - [[package]] name = "want" version = "0.3.1" @@ -4620,15 +4176,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -[[package]] -name = "winapi-util" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" -dependencies = [ - "windows-sys 0.61.0", -] - [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" diff --git a/openstack_sdk/Cargo.toml b/openstack_sdk/Cargo.toml index 3332036ba..6e5d39e7c 100644 --- a/openstack_sdk/Cargo.toml +++ b/openstack_sdk/Cargo.toml @@ -79,7 +79,7 @@ webauthn-authenticator-rs = { workspace = true, optional = true } webauthn-rs-proto = { workspace = true, optional = true } [dev-dependencies] -httpmock = "^0.7" +httpmock = "^0.8" reserve-port = "^2.2" tempfile = { workspace = true } tracing-test = { version = "^0.2" } From 308700f9529c65c77bfb9fac0a377f1044f18918 Mon Sep 17 00:00:00 2001 From: Artem Goncharov Date: Sun, 28 Sep 2025 11:31:19 +0200 Subject: [PATCH 2/2] fix: Adopt to httpmock 0.8 --- openstack_sdk/src/api/ignore.rs | 18 ++++++++---------- openstack_sdk/src/api/paged.rs | 12 ++++++------ openstack_sdk/src/api/paged/iter.rs | 12 ++++++------ openstack_sdk/src/api/rest_endpoint.rs | 7 +++---- 4 files changed, 23 insertions(+), 26 deletions(-) diff --git a/openstack_sdk/src/api/ignore.rs b/openstack_sdk/src/api/ignore.rs index 4b6397428..2c9c22af1 100644 --- a/openstack_sdk/src/api/ignore.rs +++ b/openstack_sdk/src/api/ignore.rs @@ -148,7 +148,7 @@ mod tests { let client = FakeOpenStackClient::new(server.base_url()); let mock = server.mock(|when, then| { when.method(httpmock::Method::GET).path("/dummy"); - then.status(StatusCode::OK.into()).body("not json"); + then.status(StatusCode::OK).body("not json"); }); api::ignore(Dummy).query(&client).unwrap(); @@ -162,7 +162,7 @@ mod tests { let client = FakeOpenStackClient::new(server.base_url()); let mock = server.mock(|when, then| { when.method(httpmock::Method::GET).path("/dummy"); - then.status(StatusCode::OK.into()).body("not json"); + then.status(StatusCode::OK).body("not json"); }); api::ignore(Dummy).query_async(&client).await.unwrap(); @@ -176,7 +176,7 @@ mod tests { let client = FakeOpenStackClient::new(server.base_url()); let mock = server.mock(|when, then| { when.method(httpmock::Method::GET).path("/dummy"); - then.status(StatusCode::CONFLICT.into()); + then.status(StatusCode::CONFLICT); }); let err = api::ignore(Dummy).query(&client).unwrap_err(); @@ -195,7 +195,7 @@ mod tests { let client = FakeOpenStackClient::new(server.base_url()); let mock = server.mock(|when, then| { when.method(httpmock::Method::GET).path("/dummy"); - then.status(StatusCode::CONFLICT.into()); + then.status(StatusCode::CONFLICT); }); let err = api::ignore(Dummy).query_async(&client).await.unwrap_err(); @@ -214,7 +214,7 @@ mod tests { let client = FakeOpenStackClient::new(server.base_url()); let mock = server.mock(|when, then| { when.method(httpmock::Method::GET).path("/dummy"); - then.status(StatusCode::CONFLICT.into()) + then.status(StatusCode::CONFLICT) .json_body(json!({"message": "dummy error message"})); }); @@ -234,7 +234,7 @@ mod tests { let client = FakeOpenStackClient::new(server.base_url()); let mock = server.mock(|when, then| { when.method(httpmock::Method::GET).path("/dummy"); - then.status(StatusCode::CONFLICT.into()) + then.status(StatusCode::CONFLICT) .json_body(json!({"message": "dummy error message"})); }); @@ -255,8 +255,7 @@ mod tests { let err_obj = json!({"bogus": "dummy error message"}); let mock = server.mock(|when, then| { when.method(httpmock::Method::GET).path("/dummy"); - then.status(StatusCode::CONFLICT.into()) - .json_body(err_obj.clone()); + then.status(StatusCode::CONFLICT).json_body(err_obj.clone()); }); let err = api::ignore(Dummy).query(&client).unwrap_err(); @@ -276,8 +275,7 @@ mod tests { let err_obj = json!({"bogus": "dummy error message"}); let mock = server.mock(|when, then| { when.method(httpmock::Method::GET).path("/dummy"); - then.status(StatusCode::CONFLICT.into()) - .json_body(err_obj.clone()); + then.status(StatusCode::CONFLICT).json_body(err_obj.clone()); }); let err = api::ignore(Dummy).query_async(&client).await.unwrap_err(); diff --git a/openstack_sdk/src/api/paged.rs b/openstack_sdk/src/api/paged.rs index 2d4933e77..38fb2511a 100644 --- a/openstack_sdk/src/api/paged.rs +++ b/openstack_sdk/src/api/paged.rs @@ -306,7 +306,7 @@ mod tests { let client = FakeOpenStackClient::new(server.base_url()); let mock = server.mock(|when, then| { when.method(httpmock::Method::GET).path("/paged_dummy"); - then.status(StatusCode::OK.into()).body("not json"); + then.status(StatusCode::OK).body("not json"); }); let res: Result, _> = @@ -327,7 +327,7 @@ mod tests { let client = FakeOpenStackClient::new(server.base_url()); let mock = server.mock(|when, then| { when.method(httpmock::Method::GET).path("/paged_dummy"); - then.status(StatusCode::OK.into()).body("not json"); + then.status(StatusCode::OK).body("not json"); }); let res: Result, _> = api::paged(Dummy::default(), Pagination::All) @@ -349,7 +349,7 @@ mod tests { let client = FakeOpenStackClient::new(server.base_url()); let mock = server.mock(|when, then| { when.method(httpmock::Method::GET).path("/paged_dummy"); - then.status(StatusCode::CONFLICT.into()); + then.status(StatusCode::CONFLICT); }); let res: Result, _> = @@ -370,7 +370,7 @@ mod tests { let client = FakeOpenStackClient::new(server.base_url()); let mock = server.mock(|when, then| { when.method(httpmock::Method::GET).path("/paged_dummy"); - then.status(StatusCode::CONFLICT.into()); + then.status(StatusCode::CONFLICT); }); let res: Result, _> = api::paged(Dummy::default(), Pagination::All) @@ -392,7 +392,7 @@ mod tests { let client = FakeOpenStackClient::new(server.base_url()); let mock = server.mock(|when, then| { when.method(httpmock::Method::GET).path("/paged_dummy"); - then.status(StatusCode::CONFLICT.into()) + then.status(StatusCode::CONFLICT) .json_body(json!({"message": "dummy error message"})); }); let endpoint = Dummy::default(); @@ -414,7 +414,7 @@ mod tests { let client = FakeOpenStackClient::new(server.base_url()); let mock = server.mock(|when, then| { when.method(httpmock::Method::GET).path("/paged_dummy"); - then.status(StatusCode::CONFLICT.into()) + then.status(StatusCode::CONFLICT) .json_body(json!({"message": "dummy error message"})); }); let endpoint = Dummy::default(); diff --git a/openstack_sdk/src/api/paged/iter.rs b/openstack_sdk/src/api/paged/iter.rs index 3ff0f073f..5db7cc42d 100644 --- a/openstack_sdk/src/api/paged/iter.rs +++ b/openstack_sdk/src/api/paged/iter.rs @@ -509,7 +509,7 @@ mod tests { let client = FakeOpenStackClient::new(server.base_url()); let mock = server.mock(|when, then| { when.method(httpmock::Method::GET).path("/paged_dummy"); - then.status(StatusCode::OK.into()).body("not json"); + then.status(StatusCode::OK).body("not json"); }); let res: Result, _> = api::paged(Dummy::default(), Pagination::All) @@ -531,7 +531,7 @@ mod tests { let client = FakeOpenStackClient::new(server.base_url()); let mock = server.mock(|when, then| { when.method(httpmock::Method::GET).path("/paged_dummy"); - then.status(StatusCode::OK.into()).body("not json"); + then.status(StatusCode::OK).body("not json"); }); let res: Result, _> = api::paged(Dummy::default(), Pagination::All) @@ -554,7 +554,7 @@ mod tests { let client = FakeOpenStackClient::new(server.base_url()); let mock = server.mock(|when, then| { when.method(httpmock::Method::GET).path("/paged_dummy"); - then.status(StatusCode::CONFLICT.into()); + then.status(StatusCode::CONFLICT); }); let res: Result, _> = api::paged(Dummy::default(), Pagination::All) @@ -576,7 +576,7 @@ mod tests { let client = FakeOpenStackClient::new(server.base_url()); let mock = server.mock(|when, then| { when.method(httpmock::Method::GET).path("/paged_dummy"); - then.status(StatusCode::CONFLICT.into()); + then.status(StatusCode::CONFLICT); }); let res: Result, _> = api::paged(Dummy::default(), Pagination::All) @@ -599,7 +599,7 @@ mod tests { let client = FakeOpenStackClient::new(server.base_url()); let mock = server.mock(|when, then| { when.method(httpmock::Method::GET).path("/paged_dummy"); - then.status(StatusCode::CONFLICT.into()) + then.status(StatusCode::CONFLICT) .json_body(json!({"message": "dummy error message"})); }); let endpoint = Dummy::default(); @@ -623,7 +623,7 @@ mod tests { let client = FakeOpenStackClient::new(server.base_url()); let mock = server.mock(|when, then| { when.method(httpmock::Method::GET).path("/paged_dummy"); - then.status(StatusCode::CONFLICT.into()) + then.status(StatusCode::CONFLICT) .json_body(json!({"message": "dummy error message"})); }); let endpoint = Dummy::default(); diff --git a/openstack_sdk/src/api/rest_endpoint.rs b/openstack_sdk/src/api/rest_endpoint.rs index def49863a..80b10b7d8 100644 --- a/openstack_sdk/src/api/rest_endpoint.rs +++ b/openstack_sdk/src/api/rest_endpoint.rs @@ -458,7 +458,7 @@ mod tests { let client = FakeOpenStackClient::new(server.base_url()); let mock = server.mock(|when, then| { when.method(httpmock::Method::GET).path("/dummy"); - then.status(http::StatusCode::CONFLICT.into()); + then.status(http::StatusCode::CONFLICT); }); let res: Result = Dummy.query(&client); @@ -477,7 +477,7 @@ mod tests { let client = FakeOpenStackClient::new(server.base_url()); let mock = server.mock(|when, then| { when.method(httpmock::Method::GET).path("/dummy"); - then.status(http::StatusCode::CONFLICT.into()) + then.status(http::StatusCode::CONFLICT) .json_body(json!({"message": "dummy error message"})); }); @@ -504,8 +504,7 @@ mod tests { let err_obj = json!({"bogus": "dummy error message"}); let mock = server.mock(|when, then| { when.method(httpmock::Method::GET).path("/dummy"); - then.status(StatusCode::CONFLICT.into()) - .json_body(err_obj.clone()); + then.status(StatusCode::CONFLICT).json_body(err_obj.clone()); }); let res: Result = Dummy.query(&client);