Better clippy configuration (#81)

Author: fafhrd91

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changes
 
+## [3.6.2] - 2026-02-11
+
+* Better clippy configuration
+
 ## [3.6.1] - 2026-02-02
 
 * Make control module public

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-h2"
-version = "3.6.1"
+version = "3.6.2"
 license = "MIT OR Apache-2.0"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "An HTTP/2 client and server"
@@ -23,13 +23,13 @@ unstable = []
 features = []
 
 [dependencies]
-ntex-bytes = "1.4"
+ntex-bytes = "1.5"
 ntex-codec = "1.1"
 ntex-dispatcher = "3"
 ntex-http = "1"
 ntex-io = "3.7"
 ntex-net = "3"
-ntex-service = "4"
+ntex-service = "4.4"
 ntex-util = "3"
 
 bitflags = "2"
@@ -50,7 +50,7 @@ walkdir = "2.3.2"
 serde = "1"
 serde_json = "1"
 
-ntex = { version = "3.0.0-pre.15", features = ["openssl"] }
+ntex = { version = "3.2", features = ["openssl"] }
 ntex-tls = { version = "3", features = ["openssl"] }
 openssl = "0.10"
 

src/client/connector.rs

@@ -14,7 +14,7 @@ use crate::{client::ClientError, config::ServiceConfig};
 #[derive(Debug)]
 /// Http2 client connector
 pub struct Connector<A: Address, T> {
-    connector: T,
+    svc: T,
     scheme: Scheme,
     pool: pool::Pool<()>,
 
@@ -28,12 +28,12 @@ where
     IoBoxed: From<T::Response>,
 {
     /// Create new http2 connector
-    pub fn new<F>(connector: F) -> Connector<A, T>
+    pub fn new<F>(svc: F) -> Connector<A, T>
     where
         F: IntoServiceFactory<T, Connect<A>, SharedCfg>,
     {
         Connector {
-            connector: connector.into_factory(),
+            svc: svc.into_factory(),
             scheme: Scheme::HTTP,
             pool: pool::new(),
             _t: PhantomData,
@@ -63,14 +63,14 @@ where
     }
 
     /// Use custom connector
-    pub fn connector<U, F>(&self, connector: F) -> Connector<A, U>
+    pub fn connector<U, F>(&self, svc: F) -> Connector<A, U>
     where
         F: IntoServiceFactory<U, Connect<A>, SharedCfg>,
         U: ServiceFactory<Connect<A>, SharedCfg, Error = ConnectError>,
         IoBoxed: From<U::Response>,
     {
         Connector {
-            connector: connector.into_factory(),
+            svc: svc.into_factory(),
             scheme: self.scheme.clone(),
             pool: self.pool.clone(),
             _t: PhantomData,
@@ -90,7 +90,7 @@ where
     type Service = ConnectorService<A, T::Service>;
 
     async fn create(&self, cfg: SharedCfg) -> Result<Self::Service, Self::InitError> {
-        let svc = self.connector.create(cfg).await?;
+        let svc = self.svc.create(cfg).await?;
         Ok(ConnectorService {
             svc,
             scheme: self.scheme.clone(),
@@ -127,7 +127,7 @@ where
             Ok::<_, ClientError>(SimpleClient::with_params(
                 ctx.call(&self.svc, Connect::new(req)).await?.into(),
                 self.config,
-                self.scheme.clone(),
+                &self.scheme,
                 authority,
                 false,
                 InflightStorage::default(),
@@ -137,7 +137,7 @@ where
 
         timeout_checked(self.config.handshake_timeout, fut)
             .await
-            .map_err(|_| ClientError::HandshakeTimeout)
+            .map_err(|()| ClientError::HandshakeTimeout)
             .and_then(|item| item)
     }
 

src/client/pool.rs

@@ -77,9 +77,8 @@ impl Client {
 
             if let Some(client) = client {
                 return Ok(client);
-            } else {
-                self.connect(num).await?;
             }
+            self.connect(num).await?;
         }
     }
 
@@ -120,7 +119,7 @@ impl Client {
             } else if connections[idx].is_disconnecting() {
                 let con = connections.remove(idx);
                 let timeout = cfg.disconnect_timeout;
-                let _ = ntex_util::spawn(async move {
+                ntex_util::spawn(async move {
                     let _ = con.disconnect().disconnect_timeout(timeout).await;
                 });
             } else {
@@ -164,7 +163,7 @@ impl Client {
         let inner = self.inner.clone();
         let waiters = self.waiters.clone();
 
-        let _ = ntex_util::spawn(async move {
+        ntex_util::spawn(async move {
             let res = match timeout_checked(inner.config.conn_timeout, (*inner.connector)()).await {
                 Ok(Ok(io)) => {
                     // callbacks for end of stream
@@ -176,7 +175,7 @@ impl Client {
                     let client = SimpleClient::with_params(
                         io,
                         inner.cfg,
-                        inner.config.scheme.clone(),
+                        &inner.config.scheme,
                         inner.config.authority.clone(),
                         inner.config.skip_unknown_streams,
                         storage,
@@ -190,7 +189,7 @@ impl Client {
                     Ok(())
                 }
                 Ok(Err(err)) => Err(ClientError::from(err)),
-                Err(_) => Err(ClientError::HandshakeTimeout),
+                Err(()) => Err(ClientError::HandshakeTimeout),
             };
             inner.config.connecting.set(false);
             for waiter in waiters.borrow_mut().drain(..) {
@@ -230,19 +229,18 @@ impl Client {
     /// Client is ready when it is possible to start new stream
     pub async fn ready(&self) {
         loop {
-            if !self.is_ready() {
-                // add waiter
-                let (tx, rx) = self.inner.config.pool.channel();
-                self.waiters.borrow_mut().push_back(tx);
-                let _ = rx.await;
-                'inner: while let Some(tx) = self.waiters.borrow_mut().pop_front() {
-                    if tx.send(()).is_ok() {
-                        break 'inner;
-                    }
-                }
-            } else {
+            if self.is_ready() {
                 break;
             }
+            // add waiter
+            let (tx, rx) = self.inner.config.pool.channel();
+            self.waiters.borrow_mut().push_back(tx);
+            let _ = rx.await;
+            'inner: while let Some(tx) = self.waiters.borrow_mut().pop_front() {
+                if tx.send(()).is_ok() {
+                    break 'inner;
+                }
+            }
         }
     }
 }
@@ -326,7 +324,7 @@ where
                 maxconn: 16,
                 scheme: Scheme::HTTP,
                 connecting: Cell::new(false),
-                connections: Default::default(),
+                connections: RefCell::default(),
                 total_connections: Cell::new(0),
                 connect_errors: Cell::new(0),
                 pool: pool::new(),
@@ -352,23 +350,26 @@ impl<A, T> ClientBuilder<A, T>
 where
     A: Address + Clone,
 {
-    #[inline]
+    #[must_use]
     /// Set client's connection scheme
     pub fn scheme(mut self, scheme: Scheme) -> Self {
         self.inner.scheme = scheme;
         self
     }
 
+    #[must_use]
     /// Set total number of simultaneous streams per connection.
     ///
-    /// If limit is 0, the connector uses "MAX_CONCURRENT_STREAMS" config from connection
-    /// settings.
+    /// If limit is 0, the connector uses `MAX_CONCURRENT_STREAMS` config
+    /// from connection settings.
+    ///
     /// The default limit size is 100.
     pub fn max_streams(mut self, limit: u32) -> Self {
         self.inner.max_streams = limit;
         self
     }
 
+    #[must_use]
     /// Do not return error for frames for unknown streams.
     ///
     /// This includes pending resets, data and window update frames.
@@ -377,6 +378,7 @@ where
         self
     }
 
+    #[must_use]
     /// Set max lifetime period for connection.
     ///
     /// Connection lifetime is max lifetime of any opened connection
@@ -388,6 +390,7 @@ where
         self
     }
 
+    #[must_use]
     /// Sets the minimum concurrent connections.
     ///
     /// By default min connections is set to a 1.
@@ -396,6 +399,7 @@ where
         self
     }
 
+    #[must_use]
     /// Sets the maximum concurrent connections.
     ///
     /// By default max connections is set to a 16.
@@ -447,7 +451,7 @@ where
                 cfg: cfg.get(),
                 config: self.inner,
             }),
-            waiters: Default::default(),
+            waiters: Rc::default(),
         })
     }
 }

src/client/simple.rs

@@ -29,6 +29,7 @@ struct ClientRef {
 
 impl SimpleClient {
     /// Construct new `Client` instance.
+    #[allow(clippy::needless_pass_by_value)]
     pub fn new<T>(io: T, scheme: Scheme, authority: ByteString) -> Self
     where
         IoBoxed: From<T>,
@@ -38,7 +39,7 @@ impl SimpleClient {
         SimpleClient::with_params(
             io,
             cfg,
-            scheme,
+            &scheme,
             authority,
             false,
             InflightStorage::default(),
@@ -49,7 +50,7 @@ impl SimpleClient {
     pub(super) fn with_params(
         io: IoBoxed,
         cfg: Cfg<ServiceConfig>,
-        scheme: Scheme,
+        scheme: &Scheme,
         authority: ByteString,
         skip_unknown_streams: bool,
         storage: InflightStorage,
@@ -65,7 +66,7 @@ impl SimpleClient {
             skip_unknown_streams,
             pool,
         );
-        con.set_secure(scheme == Scheme::HTTPS);
+        con.set_secure(*scheme == Scheme::HTTPS);
 
         let disp = Dispatcher::new(
             con.clone(),
@@ -74,7 +75,7 @@ impl SimpleClient {
         );
 
         let fut = IoDispatcher::new(io, con.codec().clone(), disp);
-        let _ = ntex_util::spawn(async move {
+        ntex_util::spawn(async move {
             let _ = fut.await;
         });
 
@@ -136,13 +137,13 @@ impl SimpleClient {
     /// Gracefully close connection
     pub fn close(&self) {
         log::debug!("Closing client");
-        self.0.con.disconnect_when_ready()
+        self.0.con.disconnect_when_ready();
     }
 
     #[inline]
     /// Close connection
     pub fn force_close(&self) {
-        self.0.con.close()
+        self.0.con.close();
     }
 
     #[inline]
@@ -209,8 +210,7 @@ impl SimpleClient {
 impl Drop for SimpleClient {
     fn drop(&mut self) {
         if Rc::strong_count(&self.0) == 1 {
-            log::debug!("Last h2 client has been dropped, disconnecting");
-            self.0.con.disconnect_when_ready()
+            self.0.con.disconnect_when_ready();
         }
     }
 }
@@ -284,7 +284,7 @@ fn gen_id() -> ByteString {
     let mut id = String::with_capacity(16);
     for _ in 0..16 {
         let idx = rng.generate_range::<usize, _>(..BASE.len());
-        id.push_str(&BASE[idx..idx + 1]);
+        id.push_str(&BASE[idx..=idx]);
     }
     ByteString::from(id)
 }