clippy fixes

alphal00p · Mar 27, 2024 · 6b87936 · 6b87936
1 parent f12d23f
commit 6b87936
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 143 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/src/api/python.rs b/src/api/python.rs
@@ -322,7 +322,7 @@ impl PythonWorker {
                 .export_numerator(export_root, Self::printer_options(format))
                 .map_err(|e| exceptions::PyException::new_err(e.to_string()))?;
         }
-        Ok(format!("Exported numerators"))
+        Ok("Exported numerators".to_string())
     }
 
     pub fn export_coupling_replacement_rules(
@@ -333,7 +333,7 @@ impl PythonWorker {
         self.model
             .export_coupling_replacement_rules(export_root, Self::printer_options(format))
             .map_err(|e| exceptions::PyException::new_err(e.to_string()))?;
-        Ok(format!("Exported coupling substitutions"))
+        Ok("Exported coupling substitutions".to_string())
     }
 
     pub fn export_lmb_subs(&self, export_root: &str, format: &str) -> PyResult<String> {
@@ -343,7 +343,7 @@ impl PythonWorker {
                 .map_err(|e| exceptions::PyException::new_err(e.to_string()))
                 .unwrap();
         }
-        Ok(format!("Exported lmb substitutions"))
+        Ok("Exported lmb substitutions".to_string())
     }
 
     pub fn inspect_integrand(

diff --git a/src/graph.rs b/src/graph.rs
@@ -816,7 +816,7 @@ impl Graph {
         for (i, signature) in lmb.edge_signatures.iter().enumerate() {
             rule.push((
                 Atom::parse(&format!("Q{}(x{}__)", i, i)).unwrap(),
-                self.replacement_rule_from_signature(i, &signature),
+                self.replacement_rule_from_signature(i, signature),
             ));
         }
 

diff --git a/src/numerator/tests.rs b/src/numerator/tests.rs
@@ -5,10 +5,10 @@ use crate::{tensor::SymbolicTensor, tests_from_pytest::load_amplitude_output};
 #[test]
 #[allow(unused)]
 fn lbl() {
-    let (model, amplitude) = load_amplitude_output(&"./src/test_resources/lbl/");
+    let (model, amplitude) = load_amplitude_output("./src/test_resources/lbl/");
 
     model
-        .export_coupling_replacement_rules(&"./ignore/", PrintOptions::mathematica())
+        .export_coupling_replacement_rules("./ignore/", PrintOptions::mathematica())
         .unwrap();
     let mut graph = amplitude.amplitude_graphs[0].graph.clone();
 

diff --git a/src/tensor/arithmetic.rs b/src/tensor/arithmetic.rs
@@ -32,11 +32,7 @@ where
             })
             .collect();
 
-        if let Some(data) = data {
-            Some(DenseTensor { structure, data })
-        } else {
-            None
-        }
+        data.map(|data| DenseTensor { structure, data })
     }
 }
 
@@ -62,11 +58,7 @@ where
             })
             .collect();
 
-        if let Some(data) = data {
-            Some(DenseTensor { structure, data })
-        } else {
-            None
-        }
+        data.map(|data| DenseTensor { structure, data })
     }
 }
 
@@ -92,11 +84,7 @@ where
             })
             .collect();
 
-        if let Some(data) = data {
-            Some(DenseTensor { structure, data })
-        } else {
-            None
-        }
+        data.map(|data| DenseTensor { structure, data })
     }
 }
 
@@ -221,11 +209,7 @@ where
             })
             .collect();
 
-        if let Some(data) = data {
-            Some(DenseTensor { structure, data })
-        } else {
-            None
-        }
+        data.map(|data| DenseTensor { structure, data })
     }
 }
 
@@ -250,11 +234,7 @@ where
             })
             .collect();
 
-        if let Some(data) = data {
-            Some(DenseTensor { structure, data })
-        } else {
-            None
-        }
+        data.map(|data| DenseTensor { structure, data })
     }
 }
 
@@ -280,11 +260,7 @@ where
             })
             .collect();
 
-        if let Some(data) = data {
-            Some(DenseTensor { structure, data })
-        } else {
-            None
-        }
+        data.map(|data| DenseTensor { structure, data })
     }
 }
 
@@ -401,14 +377,10 @@ where
     fn scalar_mul(self, rhs: &T) -> Option<Self::Output> {
         let data: Option<Vec<Out>> = self.iter_flat().map(|(_, u)| u.mul_fallible(rhs)).collect();
 
-        if let Some(data) = data {
-            Some(DenseTensor {
-                structure: self.structure().clone(),
-                data,
-            })
-        } else {
-            None
-        }
+        data.map(|data| DenseTensor {
+            structure: self.structure().clone(),
+            data,
+        })
     }
 }