From 5d8880fab46132ed1f5dfb18036df5461652b8f7 Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Tue, 5 Dec 2023 18:49:18 -0500 Subject: [PATCH] stylistic review --- actix-tls/CHANGES.md | 2 -- actix-tls/Cargo.toml | 2 +- actix-tls/src/connect/uri.rs | 7 +++---- actix-tls/tests/test_connect.rs | 2 -- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/actix-tls/CHANGES.md b/actix-tls/CHANGES.md index 0192cac4..25e8e56e 100644 --- a/actix-tls/CHANGES.md +++ b/actix-tls/CHANGES.md @@ -2,8 +2,6 @@ ## Unreleased -## 3.2.0 - - Added support to `http` crate version `1.0`. ## 3.1.1 diff --git a/actix-tls/Cargo.toml b/actix-tls/Cargo.toml index 08d9530b..3b8d3ae8 100755 --- a/actix-tls/Cargo.toml +++ b/actix-tls/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-tls" -version = "3.2.0" +version = "3.1.1" authors = [ "Nikolay Kim ", "Rob Ede ", diff --git a/actix-tls/src/connect/uri.rs b/actix-tls/src/connect/uri.rs index 40aa36f4..d260bab9 100644 --- a/actix-tls/src/connect/uri.rs +++ b/actix-tls/src/connect/uri.rs @@ -1,9 +1,8 @@ -use http::Uri; -use http_1::Uri as Http1Uri; +use http as http_02; use super::Host; -impl Host for Uri { +impl Host for http_02::Uri { fn hostname(&self) -> &str { self.host().unwrap_or("") } @@ -16,7 +15,7 @@ impl Host for Uri { } } -impl Host for Http1Uri { +impl Host for http_1::Uri { fn hostname(&self) -> &str { self.host().unwrap_or("") } diff --git a/actix-tls/tests/test_connect.rs b/actix-tls/tests/test_connect.rs index dba485c8..8cf8d614 100644 --- a/actix-tls/tests/test_connect.rs +++ b/actix-tls/tests/test_connect.rs @@ -117,8 +117,6 @@ async fn test_openssl_uri() { #[cfg(all(feature = "rustls-0_21", feature = "uri"))] #[actix_rt::test] async fn test_rustls_uri_http1() { - use std::convert::TryFrom; - let srv = TestServer::start(|| { fn_service(|io: TcpStream| async { let mut framed = Framed::new(io, BytesCodec);