From 7d260fea2f03e558a0359da0397ebcd4a571b68f Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Wed, 15 Jan 2025 18:11:45 +0500
Subject: [PATCH] Clippy fixes

---
 ntex-router/src/lib.rs      | 7 +------
 ntex-router/src/quoter.rs   | 2 +-
 ntex-util/src/future/mod.rs | 2 +-
 ntex/src/http/h1/service.rs | 2 +-
 ntex/src/http/h2/service.rs | 2 +-
 ntex/src/http/service.rs    | 2 +-
 6 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/ntex-router/src/lib.rs b/ntex-router/src/lib.rs
index 6d205faa..006b4063 100644
--- a/ntex-router/src/lib.rs
+++ b/ntex-router/src/lib.rs
@@ -1,9 +1,4 @@
-#![deny(
-    rust_2018_idioms,
-    warnings,
-    unreachable_pub,
-    missing_debug_implementations
-)]
+#![deny(warnings, unreachable_pub, missing_debug_implementations)]
 #![warn(nonstandard_style, future_incompatible)]
 
 //! Resource path matching library.
diff --git a/ntex-router/src/quoter.rs b/ntex-router/src/quoter.rs
index f619ea37..11593c3a 100644
--- a/ntex-router/src/quoter.rs
+++ b/ntex-router/src/quoter.rs
@@ -63,5 +63,5 @@ fn from_hex(v: u8) -> Option<u8> {
 
 #[inline]
 fn restore_ch(d1: u8, d2: u8) -> Option<u8> {
-    from_hex(d1).and_then(|d1| from_hex(d2).map(move |d2| d1 << 4 | d2))
+    from_hex(d1).and_then(|d1| from_hex(d2).map(move |d2| (d1 << 4) | d2))
 }
diff --git a/ntex-util/src/future/mod.rs b/ntex-util/src/future/mod.rs
index b510614d..d92637ae 100644
--- a/ntex-util/src/future/mod.rs
+++ b/ntex-util/src/future/mod.rs
@@ -14,7 +14,7 @@ mod select;
 pub use self::either::Either;
 pub use self::join::{join, join_all};
 pub use self::lazy::{lazy, Lazy};
-pub use self::on_drop::{OnDropFn, OnDropFutureExt};
+pub use self::on_drop::{OnDropFn, OnDropFuture, OnDropFutureExt};
 pub use self::ready::Ready;
 pub use self::select::select;
 
diff --git a/ntex/src/http/h1/service.rs b/ntex/src/http/h1/service.rs
index 63c3b85b..62c4b70f 100644
--- a/ntex/src/http/h1/service.rs
+++ b/ntex/src/http/h1/service.rs
@@ -290,7 +290,7 @@ where
             let mut inflight = self.inflight.borrow_mut();
             inflight.remove(&ioref);
 
-            if inflight.len() == 0 {
+            if inflight.is_empty() {
                 if let Some(tx) = self.tx.take() {
                     let _ = tx.send(());
                 }
diff --git a/ntex/src/http/h2/service.rs b/ntex/src/http/h2/service.rs
index 8c32e3f4..06fb0986 100644
--- a/ntex/src/http/h2/service.rs
+++ b/ntex/src/http/h2/service.rs
@@ -286,7 +286,7 @@ where
             let mut inflight = self.inflight.borrow_mut();
             inflight.remove(&ioref);
 
-            if inflight.len() == 0 {
+            if inflight.is_empty() {
                 if let Some(tx) = self.tx.take() {
                     let _ = tx.send(());
                 }
diff --git a/ntex/src/http/service.rs b/ntex/src/http/service.rs
index 0e3305ad..6174146c 100644
--- a/ntex/src/http/service.rs
+++ b/ntex/src/http/service.rs
@@ -387,7 +387,7 @@ where
             let mut inflight = self.inflight.borrow_mut();
             inflight.remove(&ioref);
 
-            if inflight.len() == 0 {
+            if inflight.is_empty() {
                 if let Some(tx) = self.tx.take() {
                     let _ = tx.send(());
                 }