From eb0666f74a838cf75ea8f49dbc90e0da42a03d37 Mon Sep 17 00:00:00 2001
From: "oxide-renovate[bot]"
 <146848827+oxide-renovate[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 03:15:51 +0000
Subject: [PATCH] Update Rust crate httptest to 0.16.1

---
 Cargo.lock                | 52 +++++++++++++++++++++++++++++++++------
 Cargo.toml                |  2 +-
 workspace-hack/Cargo.toml | 12 ++++++---
 3 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 75f9b22c2a..32cfa8335a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2965,6 +2965,25 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "h2"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "http 1.1.0",
+ "indexmap 2.2.6",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
 [[package]]
 name = "half"
 version = "2.4.1"
@@ -3214,6 +3233,19 @@ dependencies = [
  "http 1.1.0",
 ]
 
+[[package]]
+name = "http-body-util"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
+dependencies = [
+ "bytes",
+ "futures-util",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "http-range"
 version = "0.1.5"
@@ -3234,17 +3266,19 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "httptest"
-version = "0.15.5"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8b44a11846bda8c9fe9194f9924db7132c34635c7ce020f180f6c5d46d2308f"
+checksum = "ae0fc8d140f1f0f3e7f821c8eff55cd13966db7a3370b2d9a7b08e9ec8ee8786"
 dependencies = [
- "bstr 0.2.17",
+ "bstr 1.9.1",
  "bytes",
  "crossbeam-channel",
  "form_urlencoded",
  "futures",
- "http 0.2.12",
- "hyper 0.14.28",
+ "http 1.1.0",
+ "http-body-util",
+ "hyper 1.3.1",
+ "hyper-util",
  "log",
  "once_cell",
  "regex",
@@ -3311,7 +3345,7 @@ dependencies = [
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2",
+ "h2 0.3.26",
  "http 0.2.12",
  "http-body 0.4.6",
  "httparse",
@@ -3334,9 +3368,11 @@ dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
+ "h2 0.4.5",
  "http 1.1.0",
  "http-body 1.0.0",
  "httparse",
+ "httpdate",
  "itoa",
  "pin-project-lite",
  "smallvec 1.13.2",
@@ -6039,6 +6075,8 @@ dependencies = [
  "hex",
  "hmac",
  "hyper 0.14.28",
+ "hyper 1.3.1",
+ "hyper-util",
  "indexmap 2.2.6",
  "inout",
  "ipnetwork",
@@ -7943,7 +7981,7 @@ dependencies = [
  "encoding_rs",
  "futures-core",
  "futures-util",
- "h2",
+ "h2 0.3.26",
  "http 0.2.12",
  "http-body 0.4.6",
  "hyper 0.14.28",
diff --git a/Cargo.toml b/Cargo.toml
index fddf0ab37d..7f33b2876e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -329,7 +329,7 @@ hex-literal = "0.4.1"
 highway = "1.1.0"
 hkdf = "0.12.4"
 http = "0.2.12"
-httptest = "0.15.5"
+httptest = "0.16.1"
 hubtools = { git = "https://github.com/oxidecomputer/hubtools.git", branch = "main" }
 humantime = "2.1.0"
 hyper = "0.14"
diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml
index dbb4a51c43..cd62e5df61 100644
--- a/workspace-hack/Cargo.toml
+++ b/workspace-hack/Cargo.toml
@@ -25,7 +25,7 @@ bit-set = { version = "0.5.3" }
 bit-vec = { version = "0.6.3" }
 bitflags-dff4ba8e3ae991db = { package = "bitflags", version = "1.3.2" }
 bitflags-f595c2ba2a3f28df = { package = "bitflags", version = "2.5.0", default-features = false, features = ["serde", "std"] }
-bstr-6f8ce4dd05d13bba = { package = "bstr", version = "0.2.17" }
+bstr-6f8ce4dd05d13bba = { package = "bstr", version = "0.2.17", default-features = false, features = ["std", "unicode"] }
 bstr-dff4ba8e3ae991db = { package = "bstr", version = "1.9.1" }
 byteorder = { version = "1.5.0" }
 bytes = { version = "1.6.0", features = ["serde"] }
@@ -61,7 +61,9 @@ group = { version = "0.13.0", default-features = false, features = ["alloc"] }
 hashbrown = { version = "0.14.5", features = ["raw"] }
 hex = { version = "0.4.3", features = ["serde"] }
 hmac = { version = "0.12.1", default-features = false, features = ["reset"] }
-hyper = { version = "0.14.28", features = ["full"] }
+hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.28", features = ["full"] }
+hyper-dff4ba8e3ae991db = { package = "hyper", version = "1.3.1", features = ["client", "http1", "http2", "server"] }
+hyper-util = { version = "0.1.3", features = ["client-legacy", "http1", "http2", "server", "tokio"] }
 indexmap = { version = "2.2.6", features = ["serde"] }
 inout = { version = "0.1.3", default-features = false, features = ["std"] }
 ipnetwork = { version = "0.20.0", features = ["schemars"] }
@@ -130,7 +132,7 @@ bit-set = { version = "0.5.3" }
 bit-vec = { version = "0.6.3" }
 bitflags-dff4ba8e3ae991db = { package = "bitflags", version = "1.3.2" }
 bitflags-f595c2ba2a3f28df = { package = "bitflags", version = "2.5.0", default-features = false, features = ["serde", "std"] }
-bstr-6f8ce4dd05d13bba = { package = "bstr", version = "0.2.17" }
+bstr-6f8ce4dd05d13bba = { package = "bstr", version = "0.2.17", default-features = false, features = ["std", "unicode"] }
 bstr-dff4ba8e3ae991db = { package = "bstr", version = "1.9.1" }
 byteorder = { version = "1.5.0" }
 bytes = { version = "1.6.0", features = ["serde"] }
@@ -166,7 +168,9 @@ group = { version = "0.13.0", default-features = false, features = ["alloc"] }
 hashbrown = { version = "0.14.5", features = ["raw"] }
 hex = { version = "0.4.3", features = ["serde"] }
 hmac = { version = "0.12.1", default-features = false, features = ["reset"] }
-hyper = { version = "0.14.28", features = ["full"] }
+hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.28", features = ["full"] }
+hyper-dff4ba8e3ae991db = { package = "hyper", version = "1.3.1", features = ["client", "http1", "http2", "server"] }
+hyper-util = { version = "0.1.3", features = ["client-legacy", "http1", "http2", "server", "tokio"] }
 indexmap = { version = "2.2.6", features = ["serde"] }
 inout = { version = "0.1.3", default-features = false, features = ["std"] }
 ipnetwork = { version = "0.20.0", features = ["schemars"] }