Cleanup (#402)

ntex-util/Cargo.toml

@@ -28,6 +28,6 @@ futures-sink = { version = "0.3", default-features = false, features = ["alloc"]
 pin-project-lite = "0.2"
 
 [dev-dependencies]
-ntex = { version = "2", features = ["tokio"] }
+ntex = "2"
 ntex-macros = "0.1.3"
 futures-util = { version = "0.3", default-features = false, features = ["alloc"] }

ntex/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex"
-version = "2.3.0"
+version = "2.4.0"
 authors = ["ntex contributors <team@ntex.rs>"]
 description = "Framework for composable network services"
 readme = "README.md"
@@ -74,6 +74,7 @@ ntex-tls = "2.0"
 
 base64 = "0.22"
 bitflags = "2"
+bytes = "1"
 log = "0.4"
 pin-project-lite = "0.2"
 regex = { version = "1.10", default-features = false, features = ["std"] }

ntex/src/web/test.rs

@@ -693,6 +693,7 @@ where
                 },
             }
             .unwrap()
+            .set_tag("test", "WEB-SRV")
             .run();
 
             tx.send((System::current(), srv, local_addr)).unwrap();

ntex/src/web/types/state.rs

@@ -96,11 +96,8 @@ impl<T: 'static, E: ErrorRenderer> FromRequest<E> for State<T> {
 
 #[cfg(test)]
 mod tests {
-    use std::sync::{atomic::AtomicUsize, atomic::Ordering, Arc};
-
-    use super::*;
     use crate::http::StatusCode;
-    use crate::web::test::{self, init_service, TestRequest};
+    use crate::web::test::{init_service, TestRequest};
     use crate::web::{self, App, HttpResponse};
 
     #[crate::rt_test]
@@ -132,6 +129,8 @@ mod tests {
     #[cfg(feature = "tokio")]
     #[crate::rt_test]
     async fn test_state_drop() {
+        use std::sync::{atomic::AtomicUsize, atomic::Ordering, Arc};
+
         struct TestData(Arc<AtomicUsize>);
 
         impl TestData {
@@ -159,12 +158,12 @@ mod tests {
         let data = TestData::new(num.clone());
         assert_eq!(num.load(Ordering::SeqCst), 1);
 
-        let srv = test::server(move || {
+        let srv = web::test::server(move || {
             let data = data.clone();
 
-            App::new()
-                .state(data)
-                .service(web::resource("/").to(|_data: State<TestData>| async { "ok" }))
+            App::new().state(data).service(
+                web::resource("/").to(|_data: super::State<TestData>| async { "ok" }),
+            )
         });
 
         assert!(srv.get("/").send().await.unwrap().status().is_success());

ntex/src/web/util.rs

@@ -255,9 +255,9 @@ pub fn service<T: IntoPattern>(path: T) -> WebServiceAdapter {
 /// to result of the function execution.
 pub async fn block<F, I, E>(f: F) -> Result<I, BlockingError<E>>
 where
-    F: FnOnce() -> Result<I, E> + Send + 'static,
+    F: FnOnce() -> Result<I, E> + Send + Sync + 'static,
     I: Send + 'static,
-    E: Send + std::fmt::Debug + 'static,
+    E: Send + fmt::Debug + 'static,
 {
     match crate::rt::spawn_blocking(f).await {
         Ok(res) => res.map_err(BlockingError::Error),