Add missing fmt::Debug impls (#224)

* Add missing fmt::Debug impls

ntex-connect/CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## [0.3.1] - 2023-09-11
+
+* Add missing fmt::Debug impls
+
 ## [0.3.0] - 2023-06-22
 
 * Release v0.3.0

ntex-connect/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-connect"
-version = "0.3.0"
+version = "0.3.1"
 authors = ["ntex contributors <[email protected]>"]
 description = "ntexwork connect utils for ntex framework"
 keywords = ["network", "framework", "async", "futures"]
@@ -34,13 +34,13 @@ glommio = ["ntex-rt/glommio", "ntex-glommio"]
 async-std = ["ntex-rt/async-std", "ntex-async-std"]
 
 [dependencies]
-ntex-service = "1.2.0"
+ntex-service = "1.2.6"
 ntex-bytes = "0.1.19"
-ntex-http = "0.1.8"
-ntex-io = "0.3.0"
+ntex-http = "0.1.10"
+ntex-io = "0.3.3"
 ntex-rt = "0.4.7"
-ntex-tls = "0.3.0"
-ntex-util = "0.3.0"
+ntex-tls = "0.3.1"
+ntex-util = "0.3.2"
 log = "0.4"
 thiserror = "1.0"
 

ntex-connect/src/lib.rs

@@ -1,4 +1,6 @@
 //! Tcp connector service
+#![deny(rust_2018_idioms, unreachable_pub, missing_debug_implementations)]
+
 #[macro_use]
 extern crate log;
 

ntex-connect/src/openssl.rs

@@ -1,4 +1,4 @@
-use std::io;
+use std::{fmt, io};
 
 pub use ntex_tls::openssl::SslFilter;
 pub use tls_openssl::ssl::{Error as SslError, HandshakeError, SslConnector, SslMethod};
@@ -88,6 +88,15 @@ impl<T> Clone for Connector<T> {
     }
 }
 
+impl<T> fmt::Debug for Connector<T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("Connector(openssl)")
+            .field("connector", &self.connector)
+            .field("openssl", &self.openssl)
+            .finish()
+    }
+}
+
 impl<T: Address, C: 'static> ServiceFactory<Connect<T>, C> for Connector<T> {
     type Response = Io<Layer<SslFilter>>;
     type Error = ConnectError;

ntex-connect/src/rustls.rs

@@ -1,4 +1,4 @@
-use std::io;
+use std::{fmt, io};
 
 pub use ntex_tls::rustls::TlsFilter;
 pub use tls_rustls::{ClientConfig, ServerName};
@@ -92,6 +92,14 @@ impl<T> Clone for Connector<T> {
     }
 }
 
+impl<T> fmt::Debug for Connector<T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("Connector(rustls)")
+            .field("connector", &self.connector)
+            .finish()
+    }
+}
+
 impl<T: Address, C: 'static> ServiceFactory<Connect<T>, C> for Connector<T> {
     type Response = Io<Layer<TlsFilter>>;
     type Error = ConnectError;

ntex-connect/src/service.rs

@@ -1,5 +1,5 @@
 use std::task::{Context, Poll};
-use std::{collections::VecDeque, future::Future, io, net::SocketAddr, pin::Pin};
+use std::{collections::VecDeque, fmt, future::Future, io, net::SocketAddr, pin::Pin};
 
 use ntex_bytes::{PoolId, PoolRef};
 use ntex_io::{types, Io};
@@ -61,6 +61,15 @@ impl<T> Clone for Connector<T> {
     }
 }
 
+impl<T> fmt::Debug for Connector<T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("Connector")
+            .field("resolver", &self.resolver)
+            .field("memory_pool", &self.pool)
+            .finish()
+    }
+}
+
 impl<T: Address, C: 'static> ServiceFactory<Connect<T>, C> for Connector<T> {
     type Response = Io;
     type Error = ConnectError;
@@ -105,6 +114,14 @@ impl<'f, T: Address> ConnectServiceResponse<'f, T> {
     }
 }
 
+impl<'f, T: Address> fmt::Debug for ConnectServiceResponse<'f, T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("ConnectServiceResponse")
+            .field("pool", &self.pool)
+            .finish()
+    }
+}
+
 impl<'f, T: Address> Future for ConnectServiceResponse<'f, T> {
     type Output = Result<Io, ConnectError>;
 

ntex-http/CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## [0.1.10] - 2023-09-11
+
+* Add missing fmt::Debug impls
+
 ## [0.1.9] - 2022-12-09
 
 * Add helper method HeaderValue::as_shared()

ntex-http/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-http"
-version = "0.1.9"
+version = "0.1.10"
 authors = ["ntex contributors <[email protected]>"]
 description = "Http types for ntex framework"
 keywords = ["network", "framework", "async", "futures"]
@@ -20,4 +20,4 @@ http = "0.2"
 log = "0.4"
 fxhash = "0.2.1"
 itoa = "1.0.4"
-ntex-bytes = "0.1.17"
+ntex-bytes = "0.1.19"

ntex-http/src/error.rs

@@ -36,7 +36,7 @@ enum ErrorKind {
 }
 
 impl fmt::Debug for Error {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_tuple("ntex_http::Error")
             // Skip the noise of the ErrorKind enum
             .field(&self.get_ref())

ntex-http/src/lib.rs

@@ -1,4 +1,6 @@
 //! Http protocol support.
+#![deny(rust_2018_idioms, unreachable_pub, missing_debug_implementations)]
+
 pub mod error;
 mod map;
 mod value;

ntex-http/src/map.rs

@@ -62,6 +62,7 @@ impl Value {
     }
 }
 
+#[derive(Debug)]
 pub struct ValueIntoIter {
     value: Value,
 }
@@ -444,6 +445,7 @@ impl TryFrom<&str> for Value {
     }
 }
 
+#[derive(Debug)]
 pub struct GetAll<'a> {
     idx: usize,
     item: Option<&'a Value>,
@@ -477,6 +479,7 @@ impl<'a> Iterator for GetAll<'a> {
     }
 }
 
+#[derive(Debug)]
 pub struct Keys<'a>(hash_map::Keys<'a, HeaderName, Value>);
 
 impl<'a> Iterator for Keys<'a> {
@@ -497,6 +500,7 @@ impl<'a> IntoIterator for &'a HeaderMap {
     }
 }
 
+#[derive(Debug)]
 pub struct Iter<'a> {
     idx: usize,
     current: Option<(&'a HeaderName, &'a VecDeque<HeaderValue>)>,

ntex-http/src/value.rs

@@ -512,7 +512,7 @@ fn is_valid(b: u8) -> bool {
 impl Error for InvalidHeaderValue {}
 
 impl fmt::Debug for InvalidHeaderValue {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("InvalidHeaderValue")
             // skip _priv noise
             .finish()

ntex-io/CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## [0.3.3] - 2023-09-11
+
+* Add missing fmt::Debug impls
+
 ## [0.3.2] - 2023-08-10
 
 * Replace `PipelineCall` with `ServiceCall<'static, S, R>`

ntex-io/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-io"
-version = "0.3.2"
+version = "0.3.3"
 authors = ["ntex contributors <[email protected]>"]
 description = "Utilities for encoding and decoding frames"
 keywords = ["network", "framework", "async", "futures"]
@@ -18,8 +18,8 @@ path = "src/lib.rs"
 [dependencies]
 ntex-codec = "0.6.2"
 ntex-bytes = "0.1.19"
-ntex-util = "0.3.0"
-ntex-service = "1.2.3"
+ntex-util = "0.3.2"
+ntex-service = "1.2.6"
 
 bitflags = "1.3"
 log = "0.4"

ntex-io/src/buf.rs

@@ -1,12 +1,29 @@
-use std::cell::Cell;
+use std::{cell::Cell, fmt};
 
 use ntex_bytes::{BytesVec, PoolRef};
 use ntex_util::future::Either;
 
 use crate::IoRef;
 
-type Buffer = (Cell<Option<BytesVec>>, Cell<Option<BytesVec>>);
+#[derive(Default)]
+pub(crate) struct Buffer(Cell<Option<BytesVec>>, Cell<Option<BytesVec>>);
+
+impl fmt::Debug for Buffer {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let b0 = self.0.take();
+        let b1 = self.1.take();
+        let res = f
+            .debug_struct("Buffer")
+            .field("0", &b0)
+            .field("1", &b1)
+            .finish();
+        self.0.set(b0);
+        self.1.set(b1);
+        res
+    }
+}
 
+#[derive(Debug)]
 pub struct Stack {
     len: usize,
     buffers: Either<[Buffer; 3], Vec<Buffer>>,
@@ -25,29 +42,32 @@ impl Stack {
             Either::Left(b) => {
                 // move to vec
                 if self.len == 3 {
-                    let mut vec = vec![(Cell::new(None), Cell::new(None))];
+                    let mut vec = vec![Buffer(Cell::new(None), Cell::new(None))];
                     for item in b.iter_mut().take(self.len) {
-                        vec.push((Cell::new(item.0.take()), Cell::new(item.1.take())));
+                        vec.push(Buffer(
+                            Cell::new(item.0.take()),
+                            Cell::new(item.1.take()),
+                        ));
                     }
                     self.len += 1;
                     self.buffers = Either::Right(vec);
                 } else {
                     let mut idx = self.len;
                     while idx > 0 {
-                        let item = (
+                        let item = Buffer(
                             Cell::new(b[idx - 1].0.take()),
                             Cell::new(b[idx - 1].1.take()),
                         );
                         b[idx] = item;
                         idx -= 1;
                     }
-                    b[0] = (Cell::new(None), Cell::new(None));
+                    b[0] = Buffer(Cell::new(None), Cell::new(None));
                     self.len += 1;
                 }
             }
             Either::Right(vec) => {
                 self.len += 1;
-                vec.insert(0, (Cell::new(None), Cell::new(None)));
+                vec.insert(0, Buffer(Cell::new(None), Cell::new(None)));
             }
         }
     }
@@ -65,8 +85,8 @@ impl Stack {
         if self.len > next {
             f(&buffers[idx], &buffers[next])
         } else {
-            let curr = (Cell::new(buffers[idx].0.take()), Cell::new(None));
-            let next = (Cell::new(None), Cell::new(buffers[idx].1.take()));
+            let curr = Buffer(Cell::new(buffers[idx].0.take()), Cell::new(None));
+            let next = Buffer(Cell::new(None), Cell::new(buffers[idx].1.take()));
 
             let result = f(&curr, &next);
             buffers[idx].0.set(curr.0.take());
@@ -265,6 +285,7 @@ impl Stack {
     }
 }
 
+#[derive(Debug)]
 pub struct ReadBuf<'a> {
     pub(crate) io: &'a IoRef,
     pub(crate) curr: &'a Buffer,
@@ -403,6 +424,7 @@ impl<'a> ReadBuf<'a> {
     }
 }
 
+#[derive(Debug)]
 pub struct WriteBuf<'a> {
     pub(crate) io: &'a IoRef,
     pub(crate) curr: &'a Buffer,

ntex-io/src/dispatcher.rs

@@ -44,7 +44,7 @@ where
     pool: Pool,
 }
 
-pub struct DispatcherShared<S, U>
+pub(crate) struct DispatcherShared<S, U>
 where
     S: Service<DispatchItem<U>, Response = Option<Response<U>>>,
     U: Encoder + Decoder,
@@ -64,6 +64,7 @@ enum DispatcherState {
     Shutdown,
 }
 
+#[derive(Debug)]
 enum DispatcherError<S, U> {
     Encoder(U),
     Service(S),

ntex-io/src/filter.rs

@@ -2,6 +2,7 @@ use std::{any, io, task::Context, task::Poll};
 
 use super::{buf::Stack, io::Flags, FilterLayer, IoRef, ReadStatus, WriteStatus};
 
+#[derive(Debug)]
 /// Default `Io` filter
 pub struct Base(IoRef);
 
@@ -11,6 +12,7 @@ impl Base {
     }
 }
 
+#[derive(Debug)]
 pub struct Layer<F, L = Base>(pub(crate) F, L);
 
 impl<F: FilterLayer, L: Filter> Layer<F, L> {