From 93aa86e30bd2bc664aac80d7f6e02769f9a64750 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Thu, 24 Jun 2021 15:11:01 +0100
Subject: [PATCH] clippy

---
 awc/src/request.rs              |  7 ++++++-
 tests/test_error_propagation.rs | 27 +++++++++++++--------------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/awc/src/request.rs b/awc/src/request.rs
index 46dae7fa3a4..3f312f6e754 100644
--- a/awc/src/request.rs
+++ b/awc/src/request.rs
@@ -480,6 +480,7 @@ impl ClientRequest {
         // supported, so we cannot guess Accept-Encoding HTTP header.
         if slf.response_decompress {
             // Set Accept-Encoding with compression algorithm awc is built with.
+            #[allow(clippy::vec_init_then_push)]
             #[cfg(feature = "__compress")]
             let accept_encoding = {
                 let mut encoding = vec![];
@@ -496,7 +497,11 @@ impl ClientRequest {
                 #[cfg(feature = "compress-zstd")]
                 encoding.push("zstd");
 
-                assert!(!encoding.is_empty(), "encoding cannot be empty unless __compress feature has been explictily enabled.");
+                assert!(
+                    !encoding.is_empty(),
+                    "encoding can not be empty unless __compress feature has been explicitly enabled"
+                );
+
                 encoding.join(", ")
             };
 
diff --git a/tests/test_error_propagation.rs b/tests/test_error_propagation.rs
index 1b56615a07e..3e73209201e 100644
--- a/tests/test_error_propagation.rs
+++ b/tests/test_error_propagation.rs
@@ -1,12 +1,14 @@
+use std::sync::Arc;
+
 use actix_utils::future::{ok, Ready};
-use actix_web::dev::{Service, ServiceRequest, ServiceResponse, Transform};
-use actix_web::test::{call_service, init_service, TestRequest};
-use actix_web::{HttpResponse, ResponseError};
+use actix_web::{
+    dev::{forward_ready, Service, ServiceRequest, ServiceResponse, Transform},
+    get,
+    test::{call_service, init_service, TestRequest},
+    ResponseError,
+};
+use futures_core::future::LocalBoxFuture;
 use futures_util::lock::Mutex;
-use std::future::Future;
-use std::pin::Pin;
-use std::sync::Arc;
-use std::task::{Context, Poll};
 
 #[derive(Debug, Clone)]
 pub struct MyError;
@@ -19,10 +21,9 @@ impl std::fmt::Display for MyError {
     }
 }
 
-#[actix_web::get("/test")]
+#[get("/test")]
 async fn test() -> Result<actix_web::HttpResponse, actix_web::error::Error> {
-    Err(MyError)?;
-    Ok(HttpResponse::NoContent().finish())
+    return Err(MyError.into());
 }
 
 #[derive(Clone)]
@@ -62,11 +63,9 @@ where
 {
     type Response = ServiceResponse<B>;
     type Error = actix_web::Error;
-    type Future = Pin<Box<dyn Future<Output = Result<Self::Response, Self::Error>>>>;
+    type Future = LocalBoxFuture<'static, Result<Self::Response, Self::Error>>;
 
-    fn poll_ready(&self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
-        self.service.poll_ready(cx)
-    }
+    forward_ready!(service);
 
     fn call(&self, req: ServiceRequest) -> Self::Future {
         let lock = self.was_error.clone();