Fix clippy lints (#37)

feos-org · g-bauer · Apr 14, 2022 · Mar 11, 2022 · Mar 11, 2022 · Mar 11, 2022
commit 1367124ef2fc8cd00b5cb42a1212fa7e7929515f
diff --git a/src/dft/association.rs b/src/dft/association.rs
@@ -24,7 +24,7 @@ pub struct AssociationFunctional {
 impl AssociationFunctional {
     pub fn new(parameters: Rc<PcSaftParameters>, max_iter: usize, tol: f64) -> Self {
         Self {
-            parameters: parameters.clone(),
+            parameters,
             max_iter,
             tol,
         }
@@ -54,7 +54,7 @@ where
             .add(
                 WeightFunction {
                     prefactor: p.m.mapv(N::from),
-                    kernel_radius: r.clone(),
+                    kernel_radius: r,
                     shape: WeightFunctionShape::Theta,
                 },
                 true,

diff --git a/src/dft/dispersion.rs b/src/dft/dispersion.rs
@@ -23,9 +23,7 @@ pub struct AttractiveFunctional {
 
 impl AttractiveFunctional {
     pub fn new(parameters: Rc<PcSaftParameters>) -> Self {
-        Self {
-            parameters: parameters.clone(),
-        }
+        Self { parameters }
     }
 }
 

diff --git a/src/dft/hard_chain.rs b/src/dft/hard_chain.rs
@@ -15,7 +15,7 @@ pub(super) fn hard_chain_weight_functions<N: DualNum<f64> + ScalarOperand, P: FM
     lambda: bool,
 ) -> WeightFunctionInfo<N> {
     let d = p.hs_diameter(temperature);
-    let mut weight_functions = WeightFunctionInfo::new(p.component_index().clone(), true)
+    let mut weight_functions = WeightFunctionInfo::new(p.component_index(), true)
         .add(
             WeightFunction {
                 prefactor: p.chain_length().mapv(|m| m.into()) / (&d * 8.0),
@@ -48,9 +48,7 @@ pub struct ChainFunctional {
 
 impl ChainFunctional {
     pub fn new(parameters: Rc<PcSaftParameters>) -> Self {
-        Self {
-            parameters: parameters.clone(),
-        }
+        Self { parameters }
     }
 }
 

diff --git a/src/dft/mod.rs b/src/dft/mod.rs
@@ -54,27 +54,27 @@ impl PcSaftFunctional {
         ) && parameters.m.len() == 1
         {
             let fmt_assoc = PureFMTAssocFunctional::new(parameters.clone(), fmt_version);
-            contributions.push(Box::new(fmt_assoc.clone()));
+            contributions.push(Box::new(fmt_assoc));
             if parameters.m.iter().any(|&mi| mi > 1.0) {
                 let chain = PureChainFunctional::new(parameters.clone());
-                contributions.push(Box::new(chain.clone()));
+                contributions.push(Box::new(chain));
             }
             let att = PureAttFunctional::new(parameters.clone());
-            contributions.push(Box::new(att.clone()));
+            contributions.push(Box::new(att));
         } else {
             // Hard sphere contribution
             let hs = FMTContribution::new(&parameters, fmt_version);
-            contributions.push(Box::new(hs.clone()));
+            contributions.push(Box::new(hs));
 
             // Hard chains
             if parameters.m.iter().any(|&mi| !mi.is_one()) {
                 let chain = ChainFunctional::new(parameters.clone());
-                contributions.push(Box::new(chain.clone()));
+                contributions.push(Box::new(chain));
             }
 
             // Dispersion
             let att = AttractiveFunctional::new(parameters.clone());
-            contributions.push(Box::new(att.clone()));
+            contributions.push(Box::new(att));
 
             // Association
             if parameters.nassoc > 0 {
@@ -83,7 +83,7 @@ impl PcSaftFunctional {
                     saft_options.max_iter_cross_assoc,
                     saft_options.tol_cross_assoc,
                 );
-                contributions.push(Box::new(assoc.clone()));
+                contributions.push(Box::new(assoc));
             }
         }
 
@@ -93,7 +93,7 @@ impl PcSaftFunctional {
         };
 
         (Self {
-            parameters: parameters.clone(),
+            parameters,
             fmt_version,
             options: saft_options,
             contributions,

diff --git a/src/dft/pure_saft_functional.rs b/src/dft/pure_saft_functional.rs
@@ -170,7 +170,7 @@ impl<N: DualNum<f64> + ScalarOperand> FunctionalContributionDual<N> for PureChai
             .add(
                 WeightFunction {
                     prefactor: (&self.parameters.m / 8.0).mapv(|x| x.into()),
-                    kernel_radius: d.clone(),
+                    kernel_radius: d,
                     shape: WeightFunctionShape::Theta,
                 },
                 false,

diff --git a/src/lib.rs b/src/lib.rs
@@ -1,8 +1,5 @@
 #![warn(clippy::all)]
 #![allow(clippy::too_many_arguments)]
-#![allow(clippy::many_single_char_names)]
-#![allow(clippy::suspicious_operation_groupings)]
-
 mod dft;
 mod eos;
 mod parameters;

diff --git a/tests/dft.rs b/tests/dft.rs
@@ -1,3 +1,4 @@
+#![allow(clippy::excessive_precision)]
 use approx::assert_relative_eq;
 use feos_core::parameter::{IdentifierOption, Parameter};
 use feos_core::{Contributions, PhaseEquilibrium, State};
@@ -41,19 +42,19 @@ fn test_bulk_implementations() -> Result<(), Box<dyn Error>> {
     println!("{}: {}", p[0].0, p[0].1);
     println!("{}: {}", p_pure[0].0, p_pure[0].1);
     println!("{}: {}", p_full[0].0, p_full[0].1);
-    println!("");
+    println!();
     println!("{:20}: {}", p[1].0, p[1].1);
     println!("{:20}: {}", p_pure[1].0, p_pure[1].1);
     println!("{:20}: {}", p_full[1].0, p_full[1].1);
-    println!("");
+    println!();
     println!("{:21}: {}", p[2].0, p[2].1);
     println!("{:21}: {}", p_pure[2].0, p_pure[2].1);
     println!("{:21}: {}", p_full[2].0, p_full[2].1);
-    println!("");
+    println!();
     println!("{:21}: {}", p[3].0, p[3].1);
     println!("{:21}: {}", p_pure[3].0, p_pure[3].1 + p_pure[4].1);
     println!("{:21}: {}", p_full[3].0, p_full[3].1 + p_full[5].1);
-    println!("");
+    println!();
     println!("{:21}: {}", p[4].0, p[4].1);
     println!("{:21}: {}", p_full[4].0, p_full[4].1);
 

diff --git a/tests/stability_analysis.rs b/tests/stability_analysis.rs
@@ -23,7 +23,7 @@ fn test_stability_analysis() -> Result<(), Box<dyn Error>> {
         DensityInitialization::Liquid,
     )?;
     let check = unstable.stability_analysis(Default::default())?;
-    assert!(check.len() > 0);
+    assert!(!check.is_empty());
 
     let params = PcSaftParameters::from_json(
         vec!["propane", "butane"],
@@ -42,7 +42,7 @@ fn test_stability_analysis() -> Result<(), Box<dyn Error>> {
     )?;
     let vapor_check = vle.vapor().stability_analysis(Default::default())?;
     let liquid_check = vle.liquid().stability_analysis(Default::default())?;
-    assert!(vapor_check.len() == 0);
-    assert!(liquid_check.len() == 0);
+    assert!(vapor_check.is_empty());
+    assert!(liquid_check.is_empty());
     Ok(())
 }