From 62770a9a3fec492dcc88f953b7e2652e1793c67d Mon Sep 17 00:00:00 2001 From: Kristof Mattei <864376+Kristof-Mattei@users.noreply.github.com> Date: Sun, 29 Oct 2023 14:26:02 -0700 Subject: [PATCH 1/2] chore(deps): bump switch to crates.io hyper-util --- Cargo.toml | 17 +++++++++-------- src/client.rs | 2 +- src/stream.rs | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 13b4187..f6df0fb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,18 +15,19 @@ vendored = ["native-tls/vendored"] [dependencies] bytes = "1" +http-body-util = "0.1.0" +hyper = { version = "1.0.0", default-features = false } +hyper-util = { version = "0.1.0", default-features = false, features = [ + "client-legacy", + "tokio", +] } native-tls = "0.2.1" -hyper = { version = "1.0.0-rc.4", default-features = false } -hyper-util = { git = "https://github.com/hyperium/hyper-util", default-features = false, features = [ - "client", -], rev = "11776bd742196691d03203caa0f4acd29df696bd" } tokio = "1" tokio-native-tls = "0.3" tower-service = "0.3" -http-body-util = "0.1.0-rc.3" [dev-dependencies] -tokio = { version = "1.0.0", features = ["io-std", "macros", "io-util"] } -hyper-util = { git = "https://github.com/hyperium/hyper-util", default-features = false, features = [ +hyper-util = { version = "0.1.0", default-features = false, features = [ "http1", -], rev = "11776bd742196691d03203caa0f4acd29df696bd" } +] } +tokio = { version = "1.0.0", features = ["io-std", "macros", "io-util"] } diff --git a/src/client.rs b/src/client.rs index 34b578f..cdf8d5b 100644 --- a/src/client.rs +++ b/src/client.rs @@ -2,7 +2,7 @@ use hyper::{ rt::{Read, Write}, Uri, }; -use hyper_util::{client::connect::HttpConnector, rt::TokioIo}; +use hyper_util::{client::legacy::connect::HttpConnector, rt::TokioIo}; use std::fmt; use std::future::Future; use std::pin::Pin; diff --git a/src/stream.rs b/src/stream.rs index fbd5097..13dec57 100644 --- a/src/stream.rs +++ b/src/stream.rs @@ -7,7 +7,7 @@ use std::task::{Context, Poll}; use hyper::rt::{Read, ReadBufCursor, Write}; use hyper_util::{ - client::connect::{Connected, Connection}, + client::legacy::connect::{Connected, Connection}, rt::TokioIo, }; pub use tokio_native_tls::TlsStream; From b29b0e99511d9745ff07e5922a0a66e3cb087567 Mon Sep 17 00:00:00 2001 From: Kristof Mattei <864376+Kristof-Mattei@users.noreply.github.com> Date: Thu, 16 Nov 2023 21:32:11 -0700 Subject: [PATCH 2/2] fix: renamed lint name --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index ffd3c75..1bec47e 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -124,4 +124,4 @@ jobs: - uses: dtolnay/rust-toolchain@nightly - - run: cargo rustdoc -- --cfg docsrs -D broken-intra-doc-links + - run: cargo rustdoc -- --cfg docsrs -D rustdoc::broken-intra-doc-links