Clippy/fix ruleset (#598)

* Added clippy configurations in .cargo/config.toml * clippy --fix * cargo clippy --fix -- -W clippy::uninlined_format_args
paupino · Jul 16, 2023 · 031d203 · 031d203
1 parent 9787b1d
commit 031d203
Show file tree

Hide file tree

Showing 8 changed files with 130 additions and 152 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -0,0 +1,11 @@
+[target.'cfg(all())']
+rustflags = [
+    # BEGIN - Embark standard lints v0.4
+    # do not change or add/remove here, but one can add exceptions after this section
+    # for more info see: <https://github.com/EmbarkStudios/rust-ecosystem/issues/59>
+    "-Aclippy::inconsistent_digit_grouping",
+    "-Aclippy::large_digit_groups",
+    "-Aclippy::excessive_precision",
+    "-Aclippy::zero_prefixed_literal",
+]
+
diff --git a/build.rs b/build.rs
@@ -43,14 +43,14 @@ fn prepare(readme: &str) -> Result<String, Box<dyn std::error::Error>> {
             writeln!(cleaned, "```rust")?;
             writeln!(cleaned, "# use rust_decimal::Decimal;")?;
             writeln!(cleaned, "# use serde::{{Serialize, Deserialize}};")?;
-            write!(cleaned, "# #[cfg(features = \"{}\")]", feature)?;
+            write!(cleaned, "# #[cfg(features = \"{feature}\")]")?;
         } else {
             if !feature_section && line.starts_with("## Features") {
                 feature_section = true;
             } else if feature_section && line.starts_with("### ") {
                 feature = line.replace("### ", "").replace('`', "");
             }
-            write!(cleaned, "{}", line)?;
+            write!(cleaned, "{line}")?;
         }
         writeln!(cleaned)?;
     }

diff --git a/src/error.rs b/src/error.rs
@@ -57,12 +57,11 @@ impl fmt::Display for Error {
             Self::ScaleExceedsMaximumPrecision(ref scale) => {
                 write!(
                     f,
-                    "Scale exceeds the maximum precision allowed: {} > {}",
-                    scale, MAX_PRECISION_U32
+                    "Scale exceeds the maximum precision allowed: {scale} > {MAX_PRECISION_U32}"
                 )
             }
             Self::ConversionTo(ref type_name) => {
-                write!(f, "Error while converting to {}", type_name)
+                write!(f, "Error while converting to {type_name}")
             }
         }
     }

diff --git a/src/ops/array.rs b/src/ops/array.rs
@@ -358,8 +358,7 @@ mod test {
             assert_eq!(value, expected_value);
             assert_eq!(
                 value_scale, expected_scale,
-                "value: {}, requested scale: {}",
-                value_raw, new_scale
+                "value: {value_raw}, requested scale: {new_scale}"
             );
         }
     }

diff --git a/src/postgres/driver.rs b/src/postgres/driver.rs
@@ -213,7 +213,7 @@ mod test {
 
         // Test NULL
         let result: Option<Decimal> = match client.query("SELECT NULL::numeric", &[]) {
-            Ok(x) => x.iter().next().unwrap().get(0),
+            Ok(x) => x.first().unwrap().get(0),
             Err(err) => panic!("{:#?}", err),
         };
         assert_eq!(None, result);
@@ -229,9 +229,9 @@ mod test {
         let connection = connection.map(|e| e.unwrap());
         tokio::spawn(connection);
 
-        let statement = client.prepare(&"SELECT NULL::numeric").await.unwrap();
+        let statement = client.prepare("SELECT NULL::numeric").await.unwrap();
         let rows = client.query(&statement, &[]).await.unwrap();
-        let result: Option<Decimal> = rows.iter().next().unwrap().get(0);
+        let result: Option<Decimal> = rows.first().unwrap().get(0);
 
         assert_eq!(None, result);
     }
@@ -243,7 +243,7 @@ mod test {
             Err(err) => panic!("{:#?}", err),
         };
         let result: Decimal = match client.query("SELECT 1e-130::NUMERIC(130, 0)", &[]) {
-            Ok(x) => x.iter().next().unwrap().get(0),
+            Ok(x) => x.first().unwrap().get(0),
             Err(err) => panic!("error - {:#?}", err),
         };
         // We compare this to zero since it is so small that it is effectively zero
@@ -259,7 +259,7 @@ mod test {
         for &(precision, scale, sent, expected) in TEST_DECIMALS.iter() {
             let result: Decimal =
                 match client.query(&*format!("SELECT {}::NUMERIC({}, {})", sent, precision, scale), &[]) {
-                    Ok(x) => x.iter().next().unwrap().get(0),
+                    Ok(x) => x.first().unwrap().get(0),
                     Err(err) => panic!("SELECT {}::NUMERIC({}, {}), error - {:#?}", sent, precision, scale, err),
                 };
             assert_eq!(
@@ -284,11 +284,11 @@ mod test {
         tokio::spawn(connection);
         for &(precision, scale, sent, expected) in TEST_DECIMALS.iter() {
             let statement = client
-                .prepare(&*format!("SELECT {}::NUMERIC({}, {})", sent, precision, scale))
+                .prepare(&format!("SELECT {}::NUMERIC({}, {})", sent, precision, scale))
                 .await
                 .unwrap();
             let rows = client.query(&statement, &[]).await.unwrap();
-            let result: Decimal = rows.iter().next().unwrap().get(0);
+            let result: Decimal = rows.first().unwrap().get(0);
 
             assert_eq!(expected, result.to_string(), "NUMERIC({}, {})", precision, scale);
         }
@@ -304,7 +304,7 @@ mod test {
             let number = Decimal::from_str(sent).unwrap();
             let result: Decimal =
                 match client.query(&*format!("SELECT $1::NUMERIC({}, {})", precision, scale), &[&number]) {
-                    Ok(x) => x.iter().next().unwrap().get(0),
+                    Ok(x) => x.first().unwrap().get(0),
                     Err(err) => panic!("{:#?}", err),
                 };
             assert_eq!(expected, result.to_string(), "NUMERIC({}, {})", precision, scale);
@@ -323,12 +323,12 @@ mod test {
 
         for &(precision, scale, sent, expected) in TEST_DECIMALS.iter() {
             let statement = client
-                .prepare(&*format!("SELECT $1::NUMERIC({}, {})", precision, scale))
+                .prepare(&format!("SELECT $1::NUMERIC({}, {})", precision, scale))
                 .await
                 .unwrap();
             let number = Decimal::from_str(sent).unwrap();
             let rows = client.query(&statement, &[&number]).await.unwrap();
-            let result: Decimal = rows.iter().next().unwrap().get(0);
+            let result: Decimal = rows.first().unwrap().get(0);
 
             assert_eq!(expected, result.to_string(), "NUMERIC({}, {})", precision, scale);
         }
@@ -367,7 +367,7 @@ mod test {
 
         for &(precision, scale, sent) in tests.iter() {
             let statement = client
-                .prepare(&*format!("SELECT {}::NUMERIC({}, {})", sent, precision, scale))
+                .prepare(&format!("SELECT {}::NUMERIC({}, {})", sent, precision, scale))
                 .await
                 .unwrap();
 

diff --git a/src/serde.rs b/src/serde.rs
@@ -555,8 +555,7 @@ mod test {
         ];
         for &(serialized, value) in data.iter() {
             let result = serde_json::from_str(serialized);
-            assert_eq!(
-                true,
+            assert!(
                 result.is_ok(),
                 "expected successful deserialization for {}. Error: {:?}",
                 serialized,
@@ -568,7 +567,7 @@ mod test {
                 record.amount.to_string(),
                 "expected: {}, actual: {}",
                 value,
-                record.amount.to_string()
+                record.amount
             );
         }
     }

diff --git a/src/str.rs b/src/str.rs
@@ -710,7 +710,7 @@ mod test {
     fn display_does_not_overflow_max_capacity() {
         let num = Decimal::from_str("1.2").unwrap();
         let mut buffer = ArrayString::<64>::new();
-        let _ = buffer.write_fmt(format_args!("{:.31}", num)).unwrap();
+        buffer.write_fmt(format_args!("{num:.31}")).unwrap();
         assert_eq!("1.2000000000000000000000000000000", buffer.as_str());
     }