minor lints and cleanups

seanmonstar · Nov 12, 2024 · 5791379 · 5791379
1 parent e2d4b14
commit 5791379
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 16 deletions.
diff --git a/src/async_impl/client.rs b/src/async_impl/client.rs
@@ -2847,10 +2847,8 @@ fn add_cookie_header(headers: &mut HeaderMap, cookie_store: &dyn cookie::CookieS
     }
 }
 
-#[cfg(test)]
+#[cfg(all(test, not(feature = "rustls-tls-manual-roots-no-provider")))]
 mod tests {
-    #![cfg(not(feature = "rustls-tls-manual-roots-no-provider"))]
-
     #[tokio::test]
     async fn execute_request_rejects_invalid_urls() {
         let url_str = "hxxps://www.rust-lang.org/";

diff --git a/src/async_impl/request.rs b/src/async_impl/request.rs
@@ -4,8 +4,6 @@ use std::future::Future;
 use std::time::Duration;
 
 use serde::Serialize;
-#[cfg(feature = "json")]
-use serde_json;
 
 use super::body::Body;
 use super::client::{Client, Pending};
@@ -650,10 +648,8 @@ impl TryFrom<Request> for HttpRequest<Body> {
     }
 }
 
-#[cfg(test)]
+#[cfg(all(test, not(feature = "rustls-tls-manual-roots-no-provider")))]
 mod tests {
-    #![cfg(not(feature = "rustls-tls-manual-roots-no-provider"))]
-
     use super::{Client, HttpRequest, Request, RequestBuilder, Version};
     use crate::Method;
     use serde::Serialize;

diff --git a/src/async_impl/response.rs b/src/async_impl/response.rs
@@ -9,8 +9,6 @@ use hyper::{HeaderMap, StatusCode, Version};
 use hyper_util::client::legacy::connect::HttpInfo;
 #[cfg(feature = "json")]
 use serde::de::DeserializeOwned;
-#[cfg(feature = "json")]
-use serde_json;
 use tokio::time::Sleep;
 use url::Url;
 

diff --git a/src/blocking/response.rs b/src/blocking/response.rs
@@ -346,10 +346,7 @@ impl Response {
     /// # Ok(())
     /// # }
     /// ```
-    pub fn copy_to<W: ?Sized>(&mut self, w: &mut W) -> crate::Result<u64>
-    where
-        W: io::Write,
-    {
+    pub fn copy_to<W: io::Write + ?Sized>(&mut self, w: &mut W) -> crate::Result<u64> {
         io::copy(self, w).map_err(crate::error::decode_io)
     }
 
@@ -401,7 +398,7 @@ impl Response {
     /// # fn main() {}
     /// ```
     pub fn error_for_status_ref(&self) -> crate::Result<&Self> {
-        self.inner.error_for_status_ref().and_then(|_| Ok(self))
+        self.inner.error_for_status_ref().map(|_| self)
     }
 
     // private

diff --git a/tests/deflate.rs b/tests/deflate.rs
@@ -88,7 +88,6 @@ async fn deflate_case(response_size: usize, chunk_size: usize) {
     use futures_util::stream::StreamExt;
 
     let content: String = (0..response_size)
-        .into_iter()
         .map(|i| format!("test {i}"))
         .collect();
     let mut encoder = libflate::zlib::Encoder::new(Vec::new()).unwrap();