Clippy

Author: kornelski

src/lib.rs

@@ -250,17 +250,7 @@ impl CachePolicy {
             res_cc.insert("no-cache".into(), None);
         }
 
-        Self {
-            status,
-            method,
-            res,
-            req,
-            res_cc,
-            req_cc,
-            opts,
-            uri,
-            response_time,
-        }
+        Self { req, res, uri, status, method, opts, res_cc, req_cc, response_time }
     }
 
     /// Returns `true` if the response can be stored in a cache. If it's
@@ -431,7 +421,7 @@ impl CachePolicy {
             .iter()
             .filter(|(h, _)| !HOP_BY_HOP_HEADERS.contains(&h.as_str()))
         {
-            headers.insert(h.to_owned(), v.to_owned());
+            headers.insert(h.clone(), v.clone());
         }
 
         // 9.1.  Connection
@@ -587,7 +577,7 @@ impl CachePolicy {
                 let last_modified = SystemTime::UNIX_EPOCH
                     + Duration::from_secs(last_modified.unix_timestamp().max(0) as _);
                 if let Ok(diff) = server_date.duration_since(last_modified) {
-                    let secs_left = diff.as_secs() as f64 * self.opts.cache_heuristic as f64;
+                    let secs_left = diff.as_secs() as f64 * f64::from(self.opts.cache_heuristic);
                     return default_min_ttl.max(Duration::from_secs(secs_left as _));
                 }
             }
@@ -738,14 +728,14 @@ impl CachePolicy {
             // use other header fields provided in the 304 (Not Modified) response to replace all instances
             // of the corresponding header fields in the stored response.
             for (header, old_value) in &self.res {
-                let header = header.to_owned();
+                let header = header.clone();
                 if let Some(new_value) = response_headers.get(&header) {
                     if !EXCLUDED_FROM_REVALIDATION_UPDATE.contains(&header.as_str()) {
-                        new_response_headers.insert(header, new_value.to_owned());
+                        new_response_headers.insert(header, new_value.clone());
                         continue;
                     }
                 }
-                new_response_headers.insert(header, old_value.to_owned());
+                new_response_headers.insert(header, old_value.clone());
             }
             response_status = self.status;
             new_response_headers

tests/responsetest.rs

@@ -98,7 +98,7 @@ fn pre_check_tolerated() {
             "cache-control": cc
         },
     );
-    assert!(cache.is_stale(now), "{:#?}", cache);
+    assert!(cache.is_stale(now), "{cache:#?}");
     assert!(!cache.is_storable());
     assert_eq!(cache.time_to_live(now).as_secs(), 0);
     assert_eq!(
@@ -405,7 +405,7 @@ fn blank_cache_control_and_pragma_no_cache() {
             "last-modified": date_str(SystemTime::now() - Duration::from_secs(10)),
         },
     );
-    assert!(!cache.is_stale(SystemTime::now()), "{:#?}", cache);
+    assert!(!cache.is_stale(SystemTime::now()), "{cache:#?}");
 }
 
 #[test]

tests/revalidate.rs

@@ -62,10 +62,10 @@ fn very_old_date() -> &'static str {
 }
 
 fn assert_no_connection(headers: &HeaderMap<HeaderValue>) {
-    assert!(!headers.contains_key(header::CONNECTION), "{:#?}", headers);
+    assert!(!headers.contains_key(header::CONNECTION), "{headers:#?}");
 }
 fn assert_custom_header(headers: &HeaderMap<HeaderValue>) {
-    assert!(headers.contains_key("x-custom"), "{:#?}", headers);
+    assert!(headers.contains_key("x-custom"), "{headers:#?}");
     assert_eq!(headers.get("x-custom").unwrap(), "yes");
 }
 
@@ -91,11 +91,7 @@ fn test_ok_if_method_changes_to_head() {
     .headers;
 
     assert_custom_header(&headers);
-    assert!(
-        headers.contains_key(header::IF_NONE_MATCH),
-        "{:#?}",
-        headers
-    );
+    assert!(headers.contains_key(header::IF_NONE_MATCH), "{headers:#?}");
     assert_eq!(headers.get(header::IF_NONE_MATCH).unwrap(), "\"123456789\"");
 }
 
@@ -505,10 +501,10 @@ fn get_revalidation_request(
     match policy.before_request(req, now) {
         http_cache_semantics::BeforeRequest::Stale { request, matches } => {
             if !matches {
-                eprintln!("warning: req doesn't match {:#?} vs {:#?}", req, policy);
+                eprintln!("warning: req doesn't match {req:#?} vs {policy:#?}");
             }
             request
         }
-        _ => panic!("no revalidation needed {:#?} vs {:#?}", req, policy),
+        _ => panic!("no revalidation needed {req:#?} vs {policy:#?}"),
     }
 }

tests/tests.rs

@@ -78,10 +78,7 @@ fn assert_cached(should_put: bool, response_code: i32) {
     assert_eq!(
         should_put,
         policy.is_storable(),
-        "{}; {}; {:#?}",
-        should_put,
-        response_code,
-        policy
+        "{should_put}; {response_code}; {policy:#?}"
     );
 }
 
@@ -1122,8 +1119,7 @@ fn test_when_methods_match() {
                 now
             )
             .satisfies_without_revalidation(),
-        "{:?}",
-        policy
+        "{policy:?}"
     );
 }
 

tests/update.rs

@@ -134,7 +134,7 @@ fn get_revalidation_request(
     match policy.before_request(req, now) {
         http_cache_semantics::BeforeRequest::Stale { request, matches } => {
             if !matches {
-                eprintln!("warning: req doesn't match {:#?} vs {:?}", req, policy);
+                eprintln!("warning: req doesn't match {req:#?} vs {policy:?}");
             }
             request
         }