From 4be5ec7ffdf68eb0199ae70a582d65d137239b07 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Wed, 25 Aug 2021 11:27:53 +0200 Subject: [PATCH] Replace use of assert_eq with assert Reported by clippy. --- src/async_impl/request.rs | 8 ++++---- src/proxy.rs | 20 ++++++++++---------- tests/client.rs | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/async_impl/request.rs b/src/async_impl/request.rs index dbeeb58..8e936cb 100644 --- a/src/async_impl/request.rs +++ b/src/async_impl/request.rs @@ -782,7 +782,7 @@ mod tests { req.headers()["authorization"], "Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==" ); - assert_eq!(req.headers()["authorization"].is_sensitive(), true); + assert!(req.headers()["authorization"].is_sensitive()); } #[test] @@ -798,7 +798,7 @@ mod tests { assert_eq!(req.url().as_str(), "https://localhost/"); assert_eq!(req.headers()["authorization"], "Bearer Hold my bear"); - assert_eq!(req.headers()["authorization"].is_sensitive(), true); + assert!(req.headers()["authorization"].is_sensitive()); } #[test] @@ -810,7 +810,7 @@ mod tests { .body("test test test") .unwrap(); let req: Request = Request::try_from(http_request).unwrap(); - assert_eq!(req.body().is_none(), false); + assert!(req.body().is_some()); let test_data = b"test test test"; assert_eq!(req.body().unwrap().as_bytes(), Some(&test_data[..])); let headers = req.headers(); @@ -829,7 +829,7 @@ mod tests { .body("test test test") .unwrap(); let req: Request = Request::try_from(http_request).unwrap(); - assert_eq!(req.body().is_none(), false); + assert!(req.body().is_some()); let test_data = b"test test test"; assert_eq!(req.body().unwrap().as_bytes(), Some(&test_data[..])); let headers = req.headers(); diff --git a/src/proxy.rs b/src/proxy.rs index 378b60c..a2a88d5 100644 --- a/src/proxy.rs +++ b/src/proxy.rs @@ -1055,8 +1055,8 @@ mod tests { // Let other threads run now drop(_lock); - assert_eq!(baseline_proxies.contains_key("http"), false); - assert_eq!(invalid_proxies.contains_key("http"), false); + assert!(!baseline_proxies.contains_key("http")); + assert!(!invalid_proxies.contains_key("http")); let p = &valid_proxies["http"]; assert_eq!(p.scheme(), "http"); @@ -1298,7 +1298,7 @@ mod tests { }), no_proxy: None, }; - assert_eq!(http_proxy_with_auth.maybe_has_http_auth(), true); + assert!(http_proxy_with_auth.maybe_has_http_auth()); assert_eq!( http_proxy_with_auth.http_basic_auth(&Uri::from_static("http://example.com")), Some(HeaderValue::from_static("auth1")) @@ -1311,7 +1311,7 @@ mod tests { }), no_proxy: None, }; - assert_eq!(http_proxy_without_auth.maybe_has_http_auth(), false); + assert!(!http_proxy_without_auth.maybe_has_http_auth()); assert_eq!( http_proxy_without_auth.http_basic_auth(&Uri::from_static("http://example.com")), None @@ -1324,7 +1324,7 @@ mod tests { }), no_proxy: None, }; - assert_eq!(https_proxy_with_auth.maybe_has_http_auth(), false); + assert!(!https_proxy_with_auth.maybe_has_http_auth()); assert_eq!( https_proxy_with_auth.http_basic_auth(&Uri::from_static("http://example.com")), None @@ -1337,7 +1337,7 @@ mod tests { }), no_proxy: None, }; - assert_eq!(all_http_proxy_with_auth.maybe_has_http_auth(), true); + assert!(all_http_proxy_with_auth.maybe_has_http_auth()); assert_eq!( all_http_proxy_with_auth.http_basic_auth(&Uri::from_static("http://example.com")), Some(HeaderValue::from_static("auth3")) @@ -1350,7 +1350,7 @@ mod tests { }), no_proxy: None, }; - assert_eq!(all_https_proxy_with_auth.maybe_has_http_auth(), false); + assert!(!all_https_proxy_with_auth.maybe_has_http_auth()); assert_eq!( all_https_proxy_with_auth.http_basic_auth(&Uri::from_static("http://example.com")), None @@ -1363,7 +1363,7 @@ mod tests { }), no_proxy: None, }; - assert_eq!(all_https_proxy_without_auth.maybe_has_http_auth(), false); + assert!(!all_https_proxy_without_auth.maybe_has_http_auth()); assert_eq!( all_https_proxy_without_auth.http_basic_auth(&Uri::from_static("http://example.com")), None @@ -1383,7 +1383,7 @@ mod tests { })), no_proxy: None, }; - assert_eq!(system_http_proxy_with_auth.maybe_has_http_auth(), true); + assert!(system_http_proxy_with_auth.maybe_has_http_auth()); assert_eq!( system_http_proxy_with_auth.http_basic_auth(&Uri::from_static("http://example.com")), Some(HeaderValue::from_static("auth5")) @@ -1403,7 +1403,7 @@ mod tests { })), no_proxy: None, }; - assert_eq!(system_https_proxy_with_auth.maybe_has_http_auth(), false); + assert!(!system_https_proxy_with_auth.maybe_has_http_auth()); assert_eq!( system_https_proxy_with_auth.http_basic_auth(&Uri::from_static("http://example.com")), None diff --git a/tests/client.rs b/tests/client.rs index 4890b34..6219d03 100644 --- a/tests/client.rs +++ b/tests/client.rs @@ -286,7 +286,7 @@ async fn test_allowed_methods() { .send() .await; - assert_eq!(resp.is_err(), false); + assert!(resp.is_ok()); let resp = reqwest::Client::builder() .https_only(true) @@ -296,5 +296,5 @@ async fn test_allowed_methods() { .send() .await; - assert_eq!(resp.is_err(), true); + assert!(resp.is_err()); }