From a38cc7511fe71729c0613b073f4ad9965ac06525 Mon Sep 17 00:00:00 2001 From: Ryan Goodfellow Date: Thu, 14 Oct 2021 15:30:04 +0000 Subject: [PATCH] switch back to hyperium/hyper https://github.com/hyperium/hyper/pull/2664 merged --- Cargo.lock | 2 +- illumos/Cargo.toml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index be507bb0..14f8b06c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -708,7 +708,7 @@ dependencies = [ [[package]] name = "hyper" version = "0.14.13" -source = "git+https://github.com/rcgoodfellow/hyper#4440a764a80ddf98be67dde0bed888484eeca918" +source = "git+https://github.com/hyperium/hyper?branch=master#e48519a1e2f94eb7fa3fe929a1b34cd426892555" dependencies = [ "bytes", "futures-channel", diff --git a/illumos/Cargo.toml b/illumos/Cargo.toml index d667e731..ba1c7d94 100644 --- a/illumos/Cargo.toml +++ b/illumos/Cargo.toml @@ -20,8 +20,10 @@ dropshot = { git = "https://github.com/oxidecomputer/dropshot" } reqwest = { version = "0.11", features = ["blocking", "json"] } netadm-sys = { path = "/home/ry/netadm-sys/lib" } clap = { version = "3.0.0-beta.4", features = ["color"] } -hyper = { git = "https://github.com/rcgoodfellow/hyper", features = ["full"] } serde_json = "1" +# need https://github.com/hyperium/hyper/pull/2664 +hyper = { git = "https://github.com/hyperium/hyper", branch = "master", features = ["full"] } + [build-dependencies] bindgen = "0.59"