From 27b0503c92a9f4647eb58b50a5952b651594cc70 Mon Sep 17 00:00:00 2001 From: "oxide-renovate[bot]" <146848827+oxide-renovate[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 05:07:38 +0000 Subject: [PATCH] Update Rust crate hyper-staticfile to 0.10.0 --- Cargo.lock | 138 +++++++++++++++++++++++++++++++++-------------------- Cargo.toml | 2 +- 2 files changed, 88 insertions(+), 52 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a45895676bf..f30f3b56c45 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1775,7 +1775,7 @@ dependencies = [ "dns-service-client", "dropshot", "expectorate", - "http", + "http 0.2.11", "omicron-test-utils", "omicron-workspace-hack", "openapi-lint", @@ -1807,7 +1807,7 @@ name = "dns-service-client" version = "0.1.0" dependencies = [ "chrono", - "http", + "http 0.2.11", "omicron-workspace-hack", "progenitor", "reqwest", @@ -1845,7 +1845,7 @@ dependencies = [ "anyhow", "chrono", "futures", - "http", + "http 0.2.11", "ipnetwork", "omicron-workspace-hack", "omicron-zone-package", @@ -1880,8 +1880,8 @@ dependencies = [ "form_urlencoded", "futures", "hostname", - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.27", "indexmap 2.1.0", "multer", "openapiv3 2.0.0-rc.1", @@ -2028,7 +2028,7 @@ dependencies = [ "async-trait", "base64 0.21.5", "chrono", - "http", + "http 0.2.11", "omicron-sled-agent", "omicron-test-utils", "omicron-workspace-hack", @@ -2615,7 +2615,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.11", "indexmap 1.9.3", "slab", "tokio", @@ -2668,7 +2668,7 @@ dependencies = [ "base64 0.21.5", "bytes", "headers-core", - "http", + "http 0.2.11", "httpdate", "mime", "sha1", @@ -2680,7 +2680,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" dependencies = [ - "http", + "http 0.2.11", ] [[package]] @@ -2796,6 +2796,17 @@ dependencies = [ "itoa", ] +[[package]] +name = "http" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http-body" version = "0.4.5" @@ -2803,10 +2814,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", - "http", + "http 0.2.11", "pin-project-lite", ] +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.0.0", +] + [[package]] name = "http-range" version = "0.1.5" @@ -2836,8 +2857,8 @@ dependencies = [ "crossbeam-channel", "form_urlencoded", "futures", - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.27", "log", "once_cell", "regex", @@ -2923,8 +2944,8 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", - "http-body", + "http 0.2.11", + "http-body 0.4.5", "httparse", "httpdate", "itoa", @@ -2936,6 +2957,21 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "403f9214f3e703236b221f1a9cd88ec8b4adfa5296de01ab96216361f4692f56" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "pin-project-lite", + "tokio", +] + [[package]] name = "hyper-rustls" version = "0.24.2" @@ -2943,8 +2979,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.27", "log", "rustls", "rustls-native-certs", @@ -2954,15 +2990,15 @@ dependencies = [ [[package]] name = "hyper-staticfile" -version = "0.9.5" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "318ca89e4827e7fe4ddd2824f52337239796ae8ecc761a663324407dc3d8d7e7" +checksum = "847250e0ccf0c0537daf49fc5c5ff69d43a752edbabc5274bc8322e8b092c55e" dependencies = [ "futures-util", - "http", + "http 1.0.0", "http-range", "httpdate", - "hyper", + "hyper 1.0.1", "mime_guess", "percent-encoding", "rand 0.8.5", @@ -2978,7 +3014,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper", + "hyper 0.14.27", "native-tls", "tokio", "tokio-native-tls", @@ -3167,7 +3203,7 @@ dependencies = [ "futures", "hex", "hex-literal", - "http", + "http 0.2.11", "illumos-utils", "installinator-artifact-client", "installinator-common", @@ -3224,7 +3260,7 @@ dependencies = [ "clap 4.4.3", "dropshot", "expectorate", - "hyper", + "hyper 0.14.27", "installinator-common", "omicron-common", "omicron-test-utils", @@ -3276,7 +3312,7 @@ dependencies = [ "dropshot", "expectorate", "futures", - "hyper", + "hyper 0.14.27", "omicron-common", "omicron-test-utils", "omicron-workspace-hack", @@ -3858,7 +3894,7 @@ dependencies = [ "bytes", "encoding_rs", "futures-util", - "http", + "http 0.2.11", "httparse", "log", "memchr", @@ -3994,8 +4030,8 @@ dependencies = [ "futures", "gateway-client", "headers", - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.27", "hyper-rustls", "internal-dns", "ipnetwork", @@ -4103,8 +4139,8 @@ dependencies = [ "gateway-messages", "gateway-test-utils", "headers", - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.27", "internal-dns", "nexus-db-queries", "nexus-test-interface", @@ -4439,7 +4475,7 @@ dependencies = [ "expectorate", "futures", "hex", - "http", + "http 0.2.11", "ipnetwork", "lazy_static", "libc", @@ -4529,8 +4565,8 @@ dependencies = [ "gateway-sp-comms", "gateway-test-utils", "hex", - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.27", "illumos-utils", "ipcc-key-value", "omicron-common", @@ -4585,10 +4621,10 @@ dependencies = [ "gateway-test-utils", "headers", "hex", - "http", + "http 0.2.11", "httptest", "hubtools", - "hyper", + "hyper 0.14.27", "hyper-rustls", "internal-dns", "ipnetwork", @@ -4793,8 +4829,8 @@ dependencies = [ "futures", "gateway-client", "glob", - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.27", "hyper-staticfile", "illumos-utils", "internal-dns", @@ -4862,7 +4898,7 @@ dependencies = [ "filetime", "headers", "hex", - "http", + "http 0.2.11", "libc", "omicron-common", "omicron-workspace-hack", @@ -4921,7 +4957,7 @@ dependencies = [ "getrandom 0.2.10", "hashbrown 0.13.2", "hex", - "hyper", + "hyper 0.14.27", "hyper-rustls", "indexmap 2.1.0", "inout", @@ -5197,8 +5233,8 @@ dependencies = [ "base64 0.21.5", "chrono", "futures", - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.27", "omicron-workspace-hack", "progenitor", "rand 0.8.5", @@ -5271,7 +5307,7 @@ dependencies = [ "dropshot", "expectorate", "futures", - "hyper", + "hyper 0.14.27", "internal-dns", "nexus-client", "nexus-types", @@ -5344,7 +5380,7 @@ dependencies = [ "chrono", "dropshot", "futures", - "http", + "http 0.2.11", "kstat-rs", "omicron-workspace-hack", "oximeter", @@ -6062,7 +6098,7 @@ source = "git+https://github.com/oxidecomputer/progenitor?branch=main#9339b57628 dependencies = [ "getopts", "heck 0.4.1", - "http", + "http 0.2.11", "indexmap 2.1.0", "openapiv3 2.0.0-rc.1", "proc-macro2", @@ -6126,7 +6162,7 @@ dependencies = [ "clap 4.4.3", "dropshot", "futures", - "hyper", + "hyper 0.14.27", "progenitor", "propolis_types", "rand 0.8.5", @@ -6551,9 +6587,9 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", - "http-body", - "hyper", + "http 0.2.11", + "http-body 0.4.5", + "hyper 0.14.27", "hyper-rustls", "hyper-tls", "ipnet", @@ -8886,7 +8922,7 @@ dependencies = [ "base64 0.13.1", "byteorder", "bytes", - "http", + "http 0.2.11", "httparse", "log", "rand 0.8.5", @@ -8905,7 +8941,7 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http", + "http 0.2.11", "httparse", "log", "rand 0.8.5", @@ -9517,9 +9553,9 @@ dependencies = [ "gateway-messages", "gateway-test-utils", "hex", - "http", + "http 0.2.11", "hubtools", - "hyper", + "hyper 0.14.27", "illumos-utils", "installinator", "installinator-artifact-client", diff --git a/Cargo.toml b/Cargo.toml index be0e8f6d01b..981352ac574 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -212,7 +212,7 @@ hubtools = { git = "https://github.com/oxidecomputer/hubtools.git", branch = "ma humantime = "2.1.0" hyper = "0.14" hyper-rustls = "0.24.2" -hyper-staticfile = "0.9.5" +hyper-staticfile = "0.10.0" illumos-utils = { path = "illumos-utils" } indexmap = "2.1.0" indicatif = { version = "0.17.7", features = ["rayon"] }