diff --git a/ntex-router/src/resource.rs b/ntex-router/src/resource.rs index 0c18d81e..f1e3b301 100644 --- a/ntex-router/src/resource.rs +++ b/ntex-router/src/resource.rs @@ -715,9 +715,12 @@ mod tests { #[test] fn test_static_tail() { - let re = ResourceDef::new("/*"); + let re = ResourceDef::new("/*".to_string()); let tree = Tree::new(&re, 1); - assert_eq!(tree.find(&mut Path::new("/")), None); + assert_eq!( + tree.find(&mut Path::new(bytestring::ByteString::from_static("/"))), + None + ); assert_eq!(tree.find(&mut Path::new("/profile")), Some(1)); assert_eq!(tree.find(&mut Path::new("/user/profile")), Some(1)); assert_eq!(tree.find(&mut Path::new("/user/2345")), Some(1)); @@ -726,7 +729,7 @@ mod tests { assert_eq!(tree.find(&mut Path::new("/2345/sdg")), Some(1)); assert_eq!(tree.find(&mut Path::new("/user/2345/sdg")), Some(1)); - let re = ResourceDef::new("/user*"); + let re = ResourceDef::new(&("/user*".to_string())); let tree = Tree::new(&re, 1); assert_eq!(tree.find(&mut Path::new("/user/profile")), Some(1)); assert_eq!(tree.find(&mut Path::new("/user/2345")), Some(1)); diff --git a/ntex/src/web/middleware/compress.rs b/ntex/src/web/middleware/compress.rs index 960cba4b..f1b819e2 100644 --- a/ntex/src/web/middleware/compress.rs +++ b/ntex/src/web/middleware/compress.rs @@ -35,28 +35,24 @@ use crate::web::{BodyEncoding, ErrorRenderer}; /// ); /// } /// ``` -pub struct Compress { +pub struct Compress { enc: ContentEncoding, - _t: PhantomData, } -impl Compress { +impl Compress { /// Create new `Compress` middleware with default encoding. pub fn new(encoding: ContentEncoding) -> Self { - Compress { - enc: encoding, - _t: PhantomData, - } + Compress { enc: encoding } } } -impl Default for Compress { +impl Default for Compress { fn default() -> Self { Compress::new(ContentEncoding::Auto) } } -impl Transform for Compress +impl Transform for Compress where S: Service, Response = WebResponse>, E: ErrorRenderer, diff --git a/ntex/src/web/middleware/logger.rs b/ntex/src/web/middleware/logger.rs index 022c90b4..f9371360 100644 --- a/ntex/src/web/middleware/logger.rs +++ b/ntex/src/web/middleware/logger.rs @@ -492,7 +492,7 @@ mod tests { ) }; let _logger = Logger::default(); - let logger = Logger::new("%% %{User-Agent}i %{X-Test}o %{HOME}e %D test") + let logger = Logger::new("%% %{User-Agent}i %{X-Test}o %{HOME}e %D %% test") .exclude("/test"); let srv = Transform::new_transform(&logger, srv.into_service()) @@ -510,6 +510,8 @@ mod tests { let res = srv.call(req).await.unwrap(); let body = test::read_body(res).await; assert_eq!(body, Bytes::from_static(b"TEST")); + assert_eq!(body.size(), BodySize::Sized(4)); + drop(body); let req = TestRequest::with_uri("/test").to_srv_request(); let res = srv.call(req).await.unwrap();