clippy fixes

Author: saulshanabrook

src/conversions.rs

@@ -111,7 +111,7 @@ convert_enums!(
             v -> egglog::Term::Var((&v.name).into()),
             egglog::Term::Var(v) => TermVar { name: v.to_string() };
         TermApp[trait=Hash](name: String, args: Vec<usize>)
-            a -> egglog::Term::App(a.name.clone().into(), a.args.to_vec()),
+            a -> egglog::Term::App(a.name.clone(), a.args.to_vec()),
             egglog::Term::App(s, a) => TermApp {
                 name: s.to_string(),
                 args: a.to_vec()
@@ -461,11 +461,11 @@ convert_struct!(
     )
         r -> egglog::RunReport {
             updated: r.updated,
-            search_and_apply_time_per_rule: r.search_and_apply_time_per_rule.iter().map(|(k, v)| (k.clone().into(), v.clone().0)).collect(),
-            num_matches_per_rule: r.num_matches_per_rule.iter().map(|(k, v)| (k.clone().into(), *v)).collect(),
-            search_and_apply_time_per_ruleset: r.search_and_apply_time_per_ruleset.iter().map(|(k, v)| (k.clone().into(), v.clone().0)).collect(),
-            merge_time_per_ruleset: r.merge_time_per_ruleset.iter().map(|(k, v)| (k.clone().into(), v.clone().0)).collect(),
-            rebuild_time_per_ruleset: r.rebuild_time_per_ruleset.iter().map(|(k, v)| (k.clone().into(), v.clone().0)).collect(),
+            search_and_apply_time_per_rule: r.search_and_apply_time_per_rule.iter().map(|(k, v)| (k.clone(), v.clone().0)).collect(),
+            num_matches_per_rule: r.num_matches_per_rule.iter().map(|(k, v)| (k.clone(), *v)).collect(),
+            search_and_apply_time_per_ruleset: r.search_and_apply_time_per_ruleset.iter().map(|(k, v)| (k.clone(), v.clone().0)).collect(),
+            merge_time_per_ruleset: r.merge_time_per_ruleset.iter().map(|(k, v)| (k.clone(), v.clone().0)).collect(),
+            rebuild_time_per_ruleset: r.rebuild_time_per_ruleset.iter().map(|(k, v)| (k.clone(), v.clone().0)).collect(),
         },
         r -> RunReport {
             updated: r.updated,

src/egraph.rs

@@ -79,10 +79,10 @@ impl EGraph {
                 WrappedError::Egglog(e, "\nWhen running commands:\n".to_string() + &cmds_str)
             })
         });
-        if res.is_ok() {
-            if let Some(cmds) = &mut self.cmds {
-                cmds.push_str(&cmds_str);
-            }
+        if res.is_ok()
+            && let Some(cmds) = &mut self.cmds
+        {
+            cmds.push_str(&cmds_str);
         }
         res.map(|xs| xs.iter().map(|o| o.into()).collect())
     }
@@ -131,7 +131,7 @@ impl EGraph {
                 name,
                 key.into_iter().map(|v| v.0).collect::<Vec<_>>().as_slice(),
             )
-            .map(|v| Value(v))
+            .map(Value)
     }
 
     fn eval_expr(&mut self, expr: Expr) -> EggResult<(String, Value)> {
@@ -216,7 +216,7 @@ impl EGraph {
             .egraph
             .value_to_container::<egglog::sort::VecContainer>(v.0)
             .unwrap();
-        return vc.data.iter().map(|x| Value(*x)).collect();
+        vc.data.iter().map(|x| Value(*x)).collect()
     }
 
     fn value_to_function(&self, v: Value) -> (String, Vec<Value>) {

src/extract.rs

@@ -117,11 +117,7 @@ impl egglog::extract::CostModel<Cost> for CostModel {
     ) -> Cost {
         Cost(Arc::new(Python::attach(|py| match &self.enode_cost {
             Some(enode_cost) => {
-                let mut values = row
-                    .vals
-                    .iter()
-                    .map(|v| Value(v.clone()))
-                    .collect::<Vec<_>>();
+                let mut values = row.vals.iter().map(|v| Value(*v)).collect::<Vec<_>>();
                 // Remove last element which is the output
                 // this is not needed because the only thing we can do with the output is look up an analysis
                 // which we can also do with the original function
@@ -238,7 +234,7 @@ impl Extractor {
         let (cost, term) = self
             .0
             .extract_best_with_sort(&egraph.egraph, &mut termdag.0, value.0, sort.clone())
-            .ok_or(PyValueError::new_err(format!("Unextractable root")))?;
+            .ok_or(PyValueError::new_err("Unextractable root".to_string()))?;
         Ok((cost.0.clone_ref(py), term.into()))
     }
 

src/py_object_sort.rs

@@ -158,7 +158,7 @@ impl PyObjectSort {
     // Integrate with Python garbage collector
     // https://pyo3.rs/main/class/protocols#garbage-collector-integration
 
-    fn __traverse__<'py>(&self, visit: PyVisit<'_>) -> Result<(), PyTraverseError> {
+    fn __traverse__(&self, visit: PyVisit<'_>) -> Result<(), PyTraverseError> {
         visit.call(self.hashable_to_index.as_ref())?;
         self.objects
             .lock()

src/termdag.rs

@@ -23,7 +23,7 @@ impl TermDag {
     ///
     /// Panics if the term does not already exist in this [TermDag].
     pub fn lookup(&self, node: Term) -> TermId {
-        self.0.lookup(&node.into()).into()
+        self.0.lookup(&node.into())
     }
 
     /// Convert the given id to the corresponding term.
@@ -38,7 +38,7 @@ impl TermDag {
     /// Panics if any of the children are not already in the DAG.
     pub fn app(&mut self, sym: String, children: Vec<Term>) -> Term {
         self.0
-            .app(sym.into(), children.into_iter().map(|c| c.into()).collect())
+            .app(sym, children.into_iter().map(|c| c.into()).collect())
             .into()
     }
 
@@ -51,7 +51,7 @@ impl TermDag {
     /// Make and return a [`Term::Var`] with the given symbol, and insert into
     /// the DAG if it is not already present.
     pub fn var(&mut self, sym: String) -> Term {
-        self.0.var(sym.into()).into()
+        self.0.var(sym).into()
     }
 
     /// Recursively converts the given expression to a term.