Fix a few clippy warnings

Author: cschwan

pineappl/src/boc.rs

@@ -111,10 +111,10 @@ impl ScaleFuncForm {
                     Self::ScaleMax(_, _) => |(s1, s2)| s1.max(s2),
                     Self::ScaleMin(_, _) => |(s1, s2)| s1.min(s2),
                     Self::Prod(_, _) => |(s1, s2)| s1 * s2,
-                    Self::S2plusS1half(_, _) => |(s1, s2)| 0.5 * (s1 + 2.0 * s2),
-                    Self::Pow4Sum(_, _) => |(s1, s2)| (s1 * s1 + s2 * s2).sqrt(),
-                    Self::WgtAvg(_, _) => |(s1, s2)| (s1 * s1 + s2 * s2) / (s1 + s2),
-                    Self::S2plusS1fourth(_, _) => |(s1, s2)| 0.25 * s1 + s2,
+                    Self::S2plusS1half(_, _) => |(s1, s2)| 0.5 * s2.mul_add(2.0, s1),
+                    Self::Pow4Sum(_, _) => |(s1, s2)| s1.hypot(s2),
+                    Self::WgtAvg(_, _) => |(s1, s2)| s1.mul_add(s1, s2 * s2) / (s1 + s2),
+                    Self::S2plusS1fourth(_, _) => |(s1, s2)| s1.mul_add(0.25, s2),
                     Self::ExpProd2(_, _) => {
                         |(s1, s2)| (s1.sqrt() * (0.3 * s2.sqrt()).exp()).powi(2)
                     }
@@ -145,6 +145,7 @@ impl ScaleFuncForm {
     }
 
     /// TODO
+    #[must_use]
     pub fn idx(&self, indices: &[usize], scale_dims: &[usize]) -> usize {
         match self.clone() {
             Self::NoScale => unreachable!(),

pineappl/src/import_subgrid.rs

@@ -162,7 +162,7 @@ impl From<&SubgridEnum> for ImportSubgridV1 {
 
         for (mut indices, value) in subgrid.indexed_iter() {
             for (index, range) in indices.iter_mut().zip(&ranges) {
-                *index = *index - range.start;
+                *index -= range.start;
             }
 
             array[indices.as_slice()] += value;

pineappl/src/interpolation.rs

@@ -11,7 +11,7 @@ const MAX_DIMENSIONS: usize = 8;
 
 mod applgrid {
     pub fn reweight_x(x: f64) -> f64 {
-        (x.sqrt() / (1.0 - 0.99 * x)).powi(3)
+        (x.sqrt() / x.mul_add(-0.99, 1.0)).powi(3)
     }
 
     pub fn fx2(y: f64) -> f64 {
@@ -23,7 +23,7 @@ mod applgrid {
             if delta.abs() < 1e-12 {
                 return x;
             }
-            let deriv = -1.0 - 5.0 * x;
+            let deriv = x.mul_add(-5.0, -1.0);
             yp -= delta / deriv;
         }
 

pineappl/tests/drell_yan_lo.rs

@@ -98,7 +98,7 @@ fn hadronic_pspgen(rng: &mut impl Rng, mmin: f64, mmax: f64) -> Psp2to2 {
     jacobian *= tau * tau0.ln().powi(2) * r1;
 
     // theta integration (in the CMS)
-    let cos_theta = 2.0 * rng.gen::<f64>() - 1.0;
+    let cos_theta = rng.gen::<f64>().mul_add(2.0, -1.0);
     jacobian *= 2.0;
 
     let t = -0.5 * s * (1.0 - cos_theta);

pineappl_cli/tests/import.rs

@@ -90,7 +90,7 @@ const IMPORT_FLEX_GRID_QUADRATIC_SUM_STR: &str =
 -+------------+------------+--------------+-------------
 0  8.1098571e1  8.1098571e1 -4.7739590e-15 7.3274720e-15
 1  3.5222658e1  3.5222658e1  1.1102230e-15 6.8833828e-15
-2  7.7939468e0  7.7939468e0  1.9984014e-15 4.5519144e-15
+2  7.7939468e0  7.7939468e0  1.7763568e-15 4.5519144e-15
 3 9.1540624e-1 9.1540624e-1 -5.7731597e-15 7.7715612e-15
 ";
 
@@ -188,7 +188,7 @@ const IMPORT_FLEX_GRID_13_STR: &str = "b   PineAPPL     fastNLO      rel. diff
 #[cfg(feature = "fastnlo")]
 const IMPORT_FLEX_GRID_14_STR: &str = "b   PineAPPL     fastNLO      rel. diff    svmaxreldiff
 -+------------+------------+--------------+-------------
-0  8.2850540e1  8.2850540e1  6.8833828e-15 7.1054274e-15
+0  8.2850540e1  8.2850540e1  6.8833828e-15 6.8833828e-15
 1  3.5828674e1  3.5828674e1  2.6645353e-15 1.0103030e-14
 2  7.9087501e0  7.9087501e0 -8.2156504e-15 8.2156504e-15
 3 9.3462321e-1 9.3462321e-1  4.4408921e-16 8.2156504e-15

pineappl_fastnlo/src/lib.rs

@@ -228,18 +228,18 @@ impl ffi::EScaleFunctionalForm {
         match self {
             Self::kScale1 => s1 * s1,
             Self::kScale2 => s2 * s2,
-            Self::kQuadraticSum => s1 * s1 + s2 * s2,
-            Self::kQuadraticMean => 0.5 * (s1 * s1 + s2 * s2),
-            Self::kQuadraticSumOver4 => 0.25 * (s1 * s1 + s2 * s2),
+            Self::kQuadraticSum => s1.mul_add(s1, s2 * s2),
+            Self::kQuadraticMean => 0.5 * s1.mul_add(s1, s2 * s2),
+            Self::kQuadraticSumOver4 => 0.25 * s1.mul_add(s1, s2 * s2),
             Self::kLinearMean => 0.25 * (s1 + s2).powi(2),
             Self::kLinearSum => (s1 + s2).powi(2),
             Self::kScaleMax => s1.max(s2).powi(2),
             Self::kScaleMin => s1.min(s2).powi(2),
             Self::kProd => (s1 * s2).powi(2),
-            Self::kS2plusS1half => 0.5 * (s1 * s1 + 2.0 * s2 * s2),
+            Self::kS2plusS1half => 0.5 * s1.mul_add(s1, 2.0 * s2 * s2),
             Self::kPow4Sum => (s1.powi(4) + s2.powi(4)).sqrt(),
-            Self::kWgtAvg => (s1.powi(4) + s2.powi(4)) / (s1 * s1 + s2 * s2),
-            Self::kS2plusS1fourth => 0.25 * s1 * s1 + s2 * s2,
+            Self::kWgtAvg => (s1.powi(4) + s2.powi(4)) / s1.mul_add(s1, s2 * s2),
+            Self::kS2plusS1fourth => (0.25 * s1).mul_add(s1, s2 * s2),
             Self::kExpProd2 => (s1 * (0.3 * s2).exp()).powi(2),
             Self::kExtern => todo!(),
             Self::kConst => todo!(),