From db43c07e9682754f413aa79c3490bac037b4f7dc Mon Sep 17 00:00:00 2001
From: Eliza Weisman <eliza@buoyant.io>
Date: Fri, 11 Feb 2022 11:11:15 -0800
Subject: [PATCH] tower: fix annoying clippy lints (#639)

This fixes a bunch of minor clippy lints. None of them were particularly
major, but I was getting tired of the warnings showing up in vscode.

The one lint that had to be ignored rather than fixed is the
`clippy::bool_assert_comparison` lint, which triggers on the
`tower_test::assert_request_eq!` macro. The lint triggers when writing
code like `assert_eq!(whatever, true)` rather than simply
`assert!(whatever)`. In this case, this occurs because the macro makes
an assertion about a request value, and in _some_ tests, the request
type is `bool`. We can't change this to use `assert!`, because in most
cases, when the request is not `bool`, we actually do need `assert_eq!`,
so I ignored that warning.
---
 tower-test/src/macros.rs        | 9 +++++++--
 tower/examples/tower-balance.rs | 4 ++--
 tower/src/balance/p2c/test.rs   | 2 +-
 tower/src/filter/mod.rs         | 2 +-
 tower/src/limit/rate/service.rs | 2 +-
 tower/src/steer/mod.rs          | 5 ++++-
 tower/tests/builder.rs          | 2 +-
 7 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/tower-test/src/macros.rs b/tower-test/src/macros.rs
index ae24a894..33415701 100644
--- a/tower-test/src/macros.rs
+++ b/tower-test/src/macros.rs
@@ -34,8 +34,13 @@ macro_rules! assert_request_eq {
             Some(r) => r,
             None => panic!("expected a request but none was received."),
         };
-
-        assert_eq!(actual, $expect, $($arg)*);
+        // In some cases, this may be used with `bool` as the `Request` type, in
+        // which case, clippy emits a warning. However, this can't be changed to
+        // `assert!`, because the request type may *not* be `bool`...
+        #[allow(clippy::bool_assert_comparison)]
+        {
+            assert_eq!(actual, $expect, $($arg)*);
+        }
         send_response
     }};
 }
diff --git a/tower/examples/tower-balance.rs b/tower/examples/tower-balance.rs
index 49717c1e..998bb7c5 100644
--- a/tower/examples/tower-balance.rs
+++ b/tower/examples/tower-balance.rs
@@ -51,7 +51,7 @@ async fn main() {
     println!("ENDPOINT_CAPACITY={}", ENDPOINT_CAPACITY);
     print!("MAX_ENDPOINT_LATENCIES=[");
     for max in &MAX_ENDPOINT_LATENCIES {
-        let l = max.as_secs() * 1_000 + u64::from(max.subsec_nanos() / 1_000 / 1_000);
+        let l = max.as_secs() * 1_000 + u64::from(max.subsec_millis());
         print!("{}ms, ", l);
     }
     println!("]");
@@ -122,7 +122,7 @@ fn gen_disco() -> impl Discover<
                 let svc = tower::service_fn(move |_| {
                     let start = Instant::now();
 
-                    let maxms = u64::from(latency.subsec_nanos() / 1_000 / 1_000)
+                    let maxms = u64::from(latency.subsec_millis())
                         .saturating_add(latency.as_secs().saturating_mul(1_000));
                     let latency = Duration::from_millis(rand::thread_rng().gen_range(0..maxms));
 
diff --git a/tower/src/balance/p2c/test.rs b/tower/src/balance/p2c/test.rs
index 404e94ff..2370860a 100644
--- a/tower/src/balance/p2c/test.rs
+++ b/tower/src/balance/p2c/test.rs
@@ -45,7 +45,7 @@ async fn single_endpoint() {
     handle.send_error("endpoint lost");
     assert_pending!(svc.poll_ready());
     assert!(
-        svc.get_ref().len() == 0,
+        svc.get_ref().is_empty(),
         "balancer must drop failed endpoints"
     );
 }
diff --git a/tower/src/filter/mod.rs b/tower/src/filter/mod.rs
index 9ed7f63d..b7c05cf6 100644
--- a/tower/src/filter/mod.rs
+++ b/tower/src/filter/mod.rs
@@ -114,7 +114,7 @@ where
     fn call(&mut self, request: Request) -> Self::Future {
         ResponseFuture::new(match self.predicate.check(request) {
             Ok(request) => Either::Right(self.inner.call(request).err_into()),
-            Err(e) => Either::Left(futures_util::future::ready(Err(e.into()))),
+            Err(e) => Either::Left(futures_util::future::ready(Err(e))),
         })
     }
 }
diff --git a/tower/src/limit/rate/service.rs b/tower/src/limit/rate/service.rs
index 550c92d8..b7604603 100644
--- a/tower/src/limit/rate/service.rs
+++ b/tower/src/limit/rate/service.rs
@@ -73,7 +73,7 @@ where
         match self.state {
             State::Ready { .. } => return Poll::Ready(ready!(self.inner.poll_ready(cx))),
             State::Limited => {
-                if let Poll::Pending = Pin::new(&mut self.sleep).poll(cx) {
+                if Pin::new(&mut self.sleep).poll(cx).is_pending() {
                     tracing::trace!("rate limit exceeded; sleeping.");
                     return Poll::Pending;
                 }
diff --git a/tower/src/steer/mod.rs b/tower/src/steer/mod.rs
index f9d2565c..3483c928 100644
--- a/tower/src/steer/mod.rs
+++ b/tower/src/steer/mod.rs
@@ -143,7 +143,10 @@ where
             if self.not_ready.is_empty() {
                 return Poll::Ready(Ok(()));
             } else {
-                if let Poll::Pending = self.services[self.not_ready[0]].poll_ready(cx)? {
+                if self.services[self.not_ready[0]]
+                    .poll_ready(cx)?
+                    .is_pending()
+                {
                     return Poll::Pending;
                 }
 
diff --git a/tower/tests/builder.rs b/tower/tests/builder.rs
index 6e10e6fb..8bc8ce1c 100644
--- a/tower/tests/builder.rs
+++ b/tower/tests/builder.rs
@@ -30,7 +30,7 @@ async fn builder_service() {
 
     let fut = client.ready().await.unwrap().call("hello");
     assert_request_eq!(handle, true).send_response("world");
-    assert_eq!(fut.await.unwrap(), true);
+    assert!(fut.await.unwrap());
 }
 
 #[derive(Debug, Clone, Default)]