diff --git a/http-signature-normalization-actix/Cargo.toml b/http-signature-normalization-actix/Cargo.toml index 4a6e7e0..a1b1589 100644 --- a/http-signature-normalization-actix/Cargo.toml +++ b/http-signature-normalization-actix/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "http-signature-normalization-actix" description = "An HTTP Signatures library that leaves the signing to you" -version = "0.5.0-beta.12" +version = "0.5.0-beta.13" authors = ["asonix "] license-file = "LICENSE" readme = "README.md" @@ -45,7 +45,7 @@ tracing-futures = "0.2" [dev-dependencies] actix-rt = "2.3.0" -tracing-actix-web = { version = "0.5.0-beta.3" } +tracing-actix-web = { version = "0.5.0-beta.3", git = "https://github.com/asonix/tracing-actix-web", branch = "riley/beta.14" } tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt"] } [package.metadata.docs.rs] diff --git a/http-signature-normalization-actix/src/create.rs b/http-signature-normalization-actix/src/create.rs index eb135fc..6766669 100644 --- a/http-signature-normalization-actix/src/create.rs +++ b/http-signature-normalization-actix/src/create.rs @@ -1,8 +1,6 @@ //! Types for signing requests with Actix Web -use actix_http::http::header::{ - HeaderMap, HeaderName, HeaderValue, InvalidHeaderValue, AUTHORIZATION, -}; +use actix_http::header::{HeaderMap, HeaderName, HeaderValue, InvalidHeaderValue, AUTHORIZATION}; /// A thin wrapper around the underlying library's Signed type /// diff --git a/http-signature-normalization-actix/src/digest/middleware.rs b/http-signature-normalization-actix/src/digest/middleware.rs index ddb1a0b..559ed3f 100644 --- a/http-signature-normalization-actix/src/digest/middleware.rs +++ b/http-signature-normalization-actix/src/digest/middleware.rs @@ -2,7 +2,8 @@ use super::{DigestPart, DigestVerify}; use actix_web::{ - dev::{MessageBody, Payload, Service, ServiceRequest, ServiceResponse, Transform}, + body::MessageBody, + dev::{Payload, Service, ServiceRequest, ServiceResponse, Transform}, error::PayloadError, http::{header::HeaderValue, StatusCode}, web, FromRequest, HttpMessage, HttpRequest, HttpResponse, ResponseError, diff --git a/http-signature-normalization-actix/src/digest/mod.rs b/http-signature-normalization-actix/src/digest/mod.rs index 709f921..a2a2f55 100644 --- a/http-signature-normalization-actix/src/digest/mod.rs +++ b/http-signature-normalization-actix/src/digest/mod.rs @@ -27,7 +27,7 @@ pub trait DigestName { #[cfg(feature = "client")] mod client { use crate::{Config, PrepareSignError, Sign}; - use actix_http::{error::BlockingError, http::header::InvalidHeaderValue}; + use actix_http::{error::BlockingError, header::InvalidHeaderValue}; use awc::{ClientRequest, SendClientRequest}; use std::{fmt::Display, future::Future, pin::Pin}; diff --git a/http-signature-normalization-actix/src/digest/sign.rs b/http-signature-normalization-actix/src/digest/sign.rs index c3385d3..b33e8f8 100644 --- a/http-signature-normalization-actix/src/digest/sign.rs +++ b/http-signature-normalization-actix/src/digest/sign.rs @@ -1,4 +1,4 @@ -use actix_http::{error::BlockingError, http::header::InvalidHeaderValue}; +use actix_http::{error::BlockingError, header::InvalidHeaderValue}; use awc::ClientRequest; use std::{fmt::Display, future::Future, pin::Pin}; diff --git a/http-signature-normalization-actix/src/lib.rs b/http-signature-normalization-actix/src/lib.rs index 81e8491..b97bc23 100644 --- a/http-signature-normalization-actix/src/lib.rs +++ b/http-signature-normalization-actix/src/lib.rs @@ -162,7 +162,7 @@ use chrono::Duration; #[cfg(any(feature = "client", feature = "server"))] -use actix_http::http::{ +use actix_http::{ header::{HeaderMap, ToStrError}, uri::PathAndQuery, Method, @@ -206,7 +206,7 @@ pub mod prelude { DigestPart, DigestVerify, }; - pub use actix_http::http::header::{InvalidHeaderValue, ToStrError}; + pub use actix_http::header::{InvalidHeaderValue, ToStrError}; } #[cfg(feature = "server")] @@ -242,7 +242,7 @@ mod client { use super::{Config, RequiredError}; use actix_http::{ error::BlockingError, - http::header::{InvalidHeaderValue, ToStrError}, + header::{InvalidHeaderValue, ToStrError}, }; use std::{fmt::Display, future::Future, pin::Pin}; @@ -305,7 +305,7 @@ mod client { #[cfg(feature = "server")] mod server { use super::RequiredError; - use actix_http::http::header::ToStrError; + use actix_http::header::ToStrError; use std::future::Future; /// A trait for verifying signatures diff --git a/http-signature-normalization-actix/src/middleware.rs b/http-signature-normalization-actix/src/middleware.rs index 5680405..9ce56d6 100644 --- a/http-signature-normalization-actix/src/middleware.rs +++ b/http-signature-normalization-actix/src/middleware.rs @@ -2,7 +2,8 @@ use crate::{Config, PrepareVerifyError, SignatureVerify}; use actix_web::{ - dev::{MessageBody, Payload, Service, ServiceRequest, ServiceResponse, Transform}, + body::MessageBody, + dev::{Payload, Service, ServiceRequest, ServiceResponse, Transform}, http::StatusCode, Error, FromRequest, HttpMessage, HttpRequest, HttpResponse, ResponseError, }; diff --git a/http-signature-normalization-actix/src/sign.rs b/http-signature-normalization-actix/src/sign.rs index f9e65f5..f1e05ac 100644 --- a/http-signature-normalization-actix/src/sign.rs +++ b/http-signature-normalization-actix/src/sign.rs @@ -1,4 +1,4 @@ -use actix_http::{error::BlockingError, http::header::InvalidHeaderValue}; +use actix_http::{error::BlockingError, header::InvalidHeaderValue}; use awc::ClientRequest; use std::{fmt::Display, future::Future, pin::Pin};