From b5f7e6b434d9637542ccf4aeeb9407010fcba04b Mon Sep 17 00:00:00 2001
From: Kaan Barmore-Genc <kaan@bgenc.net>
Date: Mon, 13 Feb 2023 00:51:09 -0500
Subject: [PATCH] Fix clippy errors

---
 .clippy.toml                              |  3 +++
 src/ip_source/{ip_source.rs => common.rs} |  0
 src/ip_source/icanhazip.rs                |  4 ++--
 src/ip_source/ipify.rs                    |  2 +-
 src/ip_source/mod.rs                      |  2 +-
 src/ip_source/seeip.rs                    |  2 +-
 src/main.rs                               | 16 ++++++++--------
 7 files changed, 16 insertions(+), 13 deletions(-)
 create mode 100644 .clippy.toml
 rename src/ip_source/{ip_source.rs => common.rs} (100%)

diff --git a/.clippy.toml b/.clippy.toml
new file mode 100644
index 0000000..d1c7c93
--- /dev/null
+++ b/.clippy.toml
@@ -0,0 +1,3 @@
+# assert_eq!(..., true) or false is a lot clearer when testing functions that
+# return booleans.
+bool_assert_comparison = false
diff --git a/src/ip_source/ip_source.rs b/src/ip_source/common.rs
similarity index 100%
rename from src/ip_source/ip_source.rs
rename to src/ip_source/common.rs
diff --git a/src/ip_source/icanhazip.rs b/src/ip_source/icanhazip.rs
index 9d26aac..5b56ef0 100644
--- a/src/ip_source/icanhazip.rs
+++ b/src/ip_source/icanhazip.rs
@@ -2,7 +2,7 @@ use async_trait::async_trait;
 
 use crate::ClientError;
 
-use super::ip_source::IPSource;
+use super::common::IPSource;
 
 pub(crate) struct IPSourceIcanhazip;
 
@@ -34,7 +34,7 @@ impl IPSource for IPSourceIcanhazip {
 mod tests {
     use regex::Regex;
 
-    use crate::ip_source::ip_source::IPSource;
+    use crate::ip_source::common::IPSource;
 
     use super::IPSourceIcanhazip;
 
diff --git a/src/ip_source/ipify.rs b/src/ip_source/ipify.rs
index 2a0eb96..8d8c2ff 100644
--- a/src/ip_source/ipify.rs
+++ b/src/ip_source/ipify.rs
@@ -2,7 +2,7 @@ use async_trait::async_trait;
 
 use crate::ClientError;
 
-use super::ip_source::IPSource;
+use super::common::IPSource;
 
 pub(crate) struct IPSourceIpify;
 
diff --git a/src/ip_source/mod.rs b/src/ip_source/mod.rs
index fe39cc1..062df4b 100644
--- a/src/ip_source/mod.rs
+++ b/src/ip_source/mod.rs
@@ -1,4 +1,4 @@
+pub(crate) mod common;
 pub(crate) mod icanhazip;
-pub(crate) mod ip_source;
 pub(crate) mod ipify;
 pub(crate) mod seeip;
diff --git a/src/ip_source/seeip.rs b/src/ip_source/seeip.rs
index d87c526..4976a68 100644
--- a/src/ip_source/seeip.rs
+++ b/src/ip_source/seeip.rs
@@ -2,7 +2,7 @@ use async_trait::async_trait;
 
 use crate::ClientError;
 
-use super::ip_source::IPSource;
+use super::common::IPSource;
 
 pub(crate) struct IPSourceSeeIP;
 
diff --git a/src/main.rs b/src/main.rs
index f79e2e4..06b2c62 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,6 +1,6 @@
 use crate::config::Config;
 use crate::gandi::GandiAPI;
-use crate::ip_source::{ip_source::IPSource, ipify::IPSourceIpify};
+use crate::ip_source::{common::IPSource, ipify::IPSourceIpify};
 use clap::Parser;
 use config::{ConfigError, IPSourceName};
 use ip_source::icanhazip::IPSourceIcanhazip;
@@ -57,7 +57,7 @@ pub enum ApiError {
 fn api_client(api_key: &str) -> Result<Client, ClientError> {
     let client_builder = ClientBuilder::new();
 
-    let key = format!("Apikey {}", api_key);
+    let key = format!("Apikey {api_key}");
     let mut auth_value = header::HeaderValue::from_str(&key)?;
     let mut headers = header::HeaderMap::new();
     auth_value.set_sensitive(true);
@@ -108,12 +108,12 @@ async fn run(
         let ipv6 = ipv6_result.as_ref();
         println!("Found these:");
         match ipv4 {
-            Ok(ip) => println!("\tIPv4: {}", ip),
-            Err(err) => eprintln!("\tIPv4 failed: {}", err),
+            Ok(ip) => println!("\tIPv4: {ip}"),
+            Err(err) => eprintln!("\tIPv4 failed: {err}"),
         }
         match ipv6 {
-            Ok(ip) => println!("\tIPv6: {}", ip),
-            Err(err) => eprintln!("\tIPv6 failed: {}", err),
+            Ok(ip) => println!("\tIPv6: {ip}"),
+            Err(err) => eprintln!("\tIPv6 failed: {err}"),
         }
 
         let ipv4_same = last_ipv4
@@ -244,7 +244,7 @@ async fn run(
                             ),
                         }
                     ),
-                    Err(err) => println!("{}", err),
+                    Err(err) => println!("{err}"),
                 }
             }
             if results
@@ -292,7 +292,7 @@ async fn main() -> anyhow::Result<()> {
 
 #[cfg(test)]
 mod tests {
-    use crate::{config, ip_source::ip_source::IPSource, opts::Opts, run, ClientError};
+    use crate::{config, ip_source::common::IPSource, opts::Opts, run, ClientError};
     use async_trait::async_trait;
     use httpmock::MockServer;
     use lazy_static::lazy_static;