Skip to content
This repository was archived by the owner on Sep 14, 2022. It is now read-only.

Commit 1367124

Browse files
prehnerprehner
authored
Fix clippy lints (#37)
1 parent 7347019 commit 1367124

File tree

8 files changed

+22
-28
lines changed

8 files changed

+22
-28
lines changed

‎src/dft/association.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub struct AssociationFunctional {
2424
impl AssociationFunctional {
2525
pub fn new(parameters: Rc<PcSaftParameters>, max_iter: usize, tol: f64) -> Self {
2626
Self {
27-
parameters: parameters.clone(),
27+
parameters,
2828
max_iter,
2929
tol,
3030
}
@@ -54,7 +54,7 @@ where
5454
.add(
5555
WeightFunction {
5656
prefactor: p.m.mapv(N::from),
57-
kernel_radius: r.clone(),
57+
kernel_radius: r,
5858
shape: WeightFunctionShape::Theta,
5959
},
6060
true,

‎src/dft/dispersion.rs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@ pub struct AttractiveFunctional {
2323

2424
impl AttractiveFunctional {
2525
pub fn new(parameters: Rc<PcSaftParameters>) -> Self {
26-
Self {
27-
parameters: parameters.clone(),
28-
}
26+
Self { parameters }
2927
}
3028
}
3129

‎src/dft/hard_chain.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pub(super) fn hard_chain_weight_functions<N: DualNum<f64> + ScalarOperand, P: FM
1515
lambda: bool,
1616
) -> WeightFunctionInfo<N> {
1717
let d = p.hs_diameter(temperature);
18-
let mut weight_functions = WeightFunctionInfo::new(p.component_index().clone(), true)
18+
let mut weight_functions = WeightFunctionInfo::new(p.component_index(), true)
1919
.add(
2020
WeightFunction {
2121
prefactor: p.chain_length().mapv(|m| m.into()) / (&d * 8.0),
@@ -48,9 +48,7 @@ pub struct ChainFunctional {
4848

4949
impl ChainFunctional {
5050
pub fn new(parameters: Rc<PcSaftParameters>) -> Self {
51-
Self {
52-
parameters: parameters.clone(),
53-
}
51+
Self { parameters }
5452
}
5553
}
5654

‎src/dft/mod.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,27 +54,27 @@ impl PcSaftFunctional {
5454
) && parameters.m.len() == 1
5555
{
5656
let fmt_assoc = PureFMTAssocFunctional::new(parameters.clone(), fmt_version);
57-
contributions.push(Box::new(fmt_assoc.clone()));
57+
contributions.push(Box::new(fmt_assoc));
5858
if parameters.m.iter().any(|&mi| mi > 1.0) {
5959
let chain = PureChainFunctional::new(parameters.clone());
60-
contributions.push(Box::new(chain.clone()));
60+
contributions.push(Box::new(chain));
6161
}
6262
let att = PureAttFunctional::new(parameters.clone());
63-
contributions.push(Box::new(att.clone()));
63+
contributions.push(Box::new(att));
6464
} else {
6565
// Hard sphere contribution
6666
let hs = FMTContribution::new(&parameters, fmt_version);
67-
contributions.push(Box::new(hs.clone()));
67+
contributions.push(Box::new(hs));
6868

6969
// Hard chains
7070
if parameters.m.iter().any(|&mi| !mi.is_one()) {
7171
let chain = ChainFunctional::new(parameters.clone());
72-
contributions.push(Box::new(chain.clone()));
72+
contributions.push(Box::new(chain));
7373
}
7474

7575
// Dispersion
7676
let att = AttractiveFunctional::new(parameters.clone());
77-
contributions.push(Box::new(att.clone()));
77+
contributions.push(Box::new(att));
7878

7979
// Association
8080
if parameters.nassoc > 0 {
@@ -83,7 +83,7 @@ impl PcSaftFunctional {
8383
saft_options.max_iter_cross_assoc,
8484
saft_options.tol_cross_assoc,
8585
);
86-
contributions.push(Box::new(assoc.clone()));
86+
contributions.push(Box::new(assoc));
8787
}
8888
}
8989

@@ -93,7 +93,7 @@ impl PcSaftFunctional {
9393
};
9494

9595
(Self {
96-
parameters: parameters.clone(),
96+
parameters,
9797
fmt_version,
9898
options: saft_options,
9999
contributions,

‎src/dft/pure_saft_functional.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ impl<N: DualNum<f64> + ScalarOperand> FunctionalContributionDual<N> for PureChai
170170
.add(
171171
WeightFunction {
172172
prefactor: (&self.parameters.m / 8.0).mapv(|x| x.into()),
173-
kernel_radius: d.clone(),
173+
kernel_radius: d,
174174
shape: WeightFunctionShape::Theta,
175175
},
176176
false,

‎src/lib.rs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
#![warn(clippy::all)]
22
#![allow(clippy::too_many_arguments)]
3-
#![allow(clippy::many_single_char_names)]
4-
#![allow(clippy::suspicious_operation_groupings)]
5-
63
mod dft;
74
mod eos;
85
mod parameters;

‎tests/dft.rs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#![allow(clippy::excessive_precision)]
12
use approx::assert_relative_eq;
23
use feos_core::parameter::{IdentifierOption, Parameter};
34
use feos_core::{Contributions, PhaseEquilibrium, State};
@@ -41,19 +42,19 @@ fn test_bulk_implementations() -> Result<(), Box<dyn Error>> {
4142
println!("{}: {}", p[0].0, p[0].1);
4243
println!("{}: {}", p_pure[0].0, p_pure[0].1);
4344
println!("{}: {}", p_full[0].0, p_full[0].1);
44-
println!("");
45+
println!();
4546
println!("{:20}: {}", p[1].0, p[1].1);
4647
println!("{:20}: {}", p_pure[1].0, p_pure[1].1);
4748
println!("{:20}: {}", p_full[1].0, p_full[1].1);
48-
println!("");
49+
println!();
4950
println!("{:21}: {}", p[2].0, p[2].1);
5051
println!("{:21}: {}", p_pure[2].0, p_pure[2].1);
5152
println!("{:21}: {}", p_full[2].0, p_full[2].1);
52-
println!("");
53+
println!();
5354
println!("{:21}: {}", p[3].0, p[3].1);
5455
println!("{:21}: {}", p_pure[3].0, p_pure[3].1 + p_pure[4].1);
5556
println!("{:21}: {}", p_full[3].0, p_full[3].1 + p_full[5].1);
56-
println!("");
57+
println!();
5758
println!("{:21}: {}", p[4].0, p[4].1);
5859
println!("{:21}: {}", p_full[4].0, p_full[4].1);
5960

‎tests/stability_analysis.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ fn test_stability_analysis() -> Result<(), Box<dyn Error>> {
2323
DensityInitialization::Liquid,
2424
)?;
2525
let check = unstable.stability_analysis(Default::default())?;
26-
assert!(check.len() > 0);
26+
assert!(!check.is_empty());
2727

2828
let params = PcSaftParameters::from_json(
2929
vec!["propane", "butane"],
@@ -42,7 +42,7 @@ fn test_stability_analysis() -> Result<(), Box<dyn Error>> {
4242
)?;
4343
let vapor_check = vle.vapor().stability_analysis(Default::default())?;
4444
let liquid_check = vle.liquid().stability_analysis(Default::default())?;
45-
assert!(vapor_check.len() == 0);
46-
assert!(liquid_check.len() == 0);
45+
assert!(vapor_check.is_empty());
46+
assert!(liquid_check.is_empty());
4747
Ok(())
4848
}

0 commit comments

Comments
 (0)