Fix a bunch of rust nits

Author: mwillsey

Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Max Willsey <me@mwillsey.com>"]
 categories = ["data-structures"]
 description = "An implementation of egraphs"
-edition = "2018"
+edition = "2024"
 keywords = ["e-graphs"]
 license = "MIT"
 name = "egg"

rust-toolchain

@@ -1 +1 @@
-1.82
+1.94

src/dot.rs

@@ -11,7 +11,7 @@ use std::fmt::{self, Debug, Display, Formatter};
 use std::io::{Error, ErrorKind, Result, Write};
 use std::path::Path;
 
-use crate::{egraph::EGraph, Analysis, Language};
+use crate::{Analysis, Language, egraph::EGraph};
 
 /**
 A wrapper for an [`EGraph`] that can output [GraphViz] for

src/egraph.rs

@@ -233,7 +233,9 @@ impl<L: Language, N: Analysis<L>> EGraph<L, N> {
     /// Make a copy of the egraph with the same nodes, but no unions between them.
     pub fn copy_without_unions(&self, analysis: N) -> Self {
         if self.explain.is_none() {
-            panic!("Use runner.with_explanations_enabled() or egraph.with_explanations_enabled() before running to get a copied egraph without unions");
+            panic!(
+                "Use runner.with_explanations_enabled() or egraph.with_explanations_enabled() before running to get a copied egraph without unions"
+            );
         }
         let mut egraph = Self::new(analysis);
         for node in &self.nodes {
@@ -430,7 +432,9 @@ impl<L: Language, N: Analysis<L>> EGraph<L, N> {
         if let Some(explain) = &self.explain {
             explain.get_union_equalities()
         } else {
-            panic!("Use runner.with_explanations_enabled() or egraph.with_explanations_enabled() before running to get union equalities");
+            panic!(
+                "Use runner.with_explanations_enabled() or egraph.with_explanations_enabled() before running to get union equalities"
+            );
         }
     }
 
@@ -453,7 +457,9 @@ impl<L: Language, N: Analysis<L>> EGraph<L, N> {
                 .with_nodes(&self.nodes)
                 .get_num_congr::<N>(&self.classes, &self.unionfind)
         } else {
-            panic!("Use runner.with_explanations_enabled() or egraph.with_explanations_enabled() before running to get explanations.")
+            panic!(
+                "Use runner.with_explanations_enabled() or egraph.with_explanations_enabled() before running to get explanations."
+            )
         }
     }
 
@@ -462,7 +468,9 @@ impl<L: Language, N: Analysis<L>> EGraph<L, N> {
         if let Some(explain) = &mut self.explain {
             explain.with_nodes(&self.nodes).get_num_nodes()
         } else {
-            panic!("Use runner.with_explanations_enabled() or egraph.with_explanations_enabled() before running to get explanations.")
+            panic!(
+                "Use runner.with_explanations_enabled() or egraph.with_explanations_enabled() before running to get explanations."
+            )
         }
     }
 
@@ -505,7 +513,9 @@ impl<L: Language, N: Analysis<L>> EGraph<L, N> {
                 &self.classes,
             )
         } else {
-            panic!("Use runner.with_explanations_enabled() or egraph.with_explanations_enabled() before running to get explanations.")
+            panic!(
+                "Use runner.with_explanations_enabled() or egraph.with_explanations_enabled() before running to get explanations."
+            )
         }
     }
 
@@ -533,7 +543,9 @@ impl<L: Language, N: Analysis<L>> EGraph<L, N> {
                 &self.classes,
             )
         } else {
-            panic!("Use runner.with_explanations_enabled() or egraph.with_explanations_enabled() before running to get explanations.");
+            panic!(
+                "Use runner.with_explanations_enabled() or egraph.with_explanations_enabled() before running to get explanations."
+            );
         }
     }
 
@@ -565,7 +577,7 @@ impl<L: Language, N: Analysis<L>> EGraph<L, N> {
     }
 
     /// Creates a [`Dot`] to visualize this egraph. See [`Dot`].
-    pub fn dot(&self) -> Dot<L, N> {
+    pub fn dot(&self) -> Dot<'_, L, N> {
         Dot {
             egraph: self,
             config: vec![],

src/explain.rs

@@ -1,8 +1,8 @@
 #![allow(clippy::only_used_in_recursion)]
 use crate::Symbol;
 use crate::{
-    util::pretty_print, Analysis, EClass, ENodeOrVar, FromOp, HashMap, HashSet, Id, Language,
-    PatternAst, RecExpr, Rewrite, UnionFind, Var,
+    Analysis, EClass, ENodeOrVar, FromOp, HashMap, HashSet, Id, Language, PatternAst, RecExpr,
+    Rewrite, UnionFind, Var, util::pretty_print,
 };
 
 use std::cmp::Ordering;
@@ -842,7 +842,8 @@ impl<L: Language> FlatTerm<L> {
                     if existing != &self {
                         panic!(
                             "Invalid proof: binding for variable {:?} does not match between {:?} \n and \n {:?}",
-                            var, existing, self);
+                            var, existing, self
+                        );
                     }
                 } else {
                     bindings.insert(*var, self);

src/extract.rs

@@ -1,7 +1,7 @@
 use std::cmp::Ordering;
 use std::fmt::Debug;
 
-use crate::util::{hashmap_with_capacity, HashMap};
+use crate::util::{HashMap, hashmap_with_capacity};
 use crate::{Analysis, EClass, EGraph, Id, Language, RecExpr};
 
 /** Extracting a single [`RecExpr`] from an [`EGraph`].

src/language.rs

@@ -500,7 +500,8 @@ impl<L: Language> RecExpr<L> {
     pub fn items_mut(
         &mut self,
     ) -> impl ExactSizeIterator<Item = (Id, &mut L)> + DoubleEndedIterator {
-        self.ids().zip(self)
+        let ids = (0..self.len()).map(Id::from);
+        ids.zip(self.iter_mut())
     }
 
     /// Checks if this expr is a DAG, i.e. doesn't have any back edges

src/lp_extract.rs

@@ -1,6 +1,6 @@
 use good_lp::{
-    default_solver, solvers::WithTimeLimit, variable, variables, Expression, Solution,
-    SolutionStatus, Solver, SolverModel, Variable,
+    Expression, Solution, SolutionStatus, Solver, SolverModel, Variable, default_solver,
+    solvers::WithTimeLimit, variable, variables,
 };
 use std::time::Instant;
 
@@ -69,7 +69,7 @@ impl<L: Language, N: Analysis<L>> LpCostFunction<L, N> for AstSize {
 /// good_lp = { version = "1", features = ["coin_cbc"] } # or highs, microlp, etc.
 /// ```
 ///
-/// See the (`good_lp` documentation)[https://docs.rs/good_lp/1/good_lp/solvers/index.html]
+/// See the [`good_lp` documentation](https://docs.rs/good_lp/1/good_lp/solvers/index.html)
 ///
 /// At run time, select the solver by calling [`Self::solve_with`], [`Self::solve_multiple_with`], [`Self::solve_with_timeout`], or [`Self::solve_multiple_with_timeout`]
 /// and passing one of the enabled `good_lp` solver implementations.
@@ -93,7 +93,7 @@ impl<L: Language, N: Analysis<L>> LpCostFunction<L, N> for AstSize {
 ///   let rec = LpExtractor::new(egraph, AstSize)
 ///       .solve_with(root, highs);
 ///   # let _ = rec;
-/// ```
+///   ```
 ///
 #[cfg_attr(docsrs, doc(cfg(feature = "lp")))]
 pub struct LpExtractor<'a, L: Language, N: Analysis<L>> {
@@ -304,7 +304,7 @@ where
         (expr, root_idxs)
     }
 
-    /// Like [`solve_multiple`], but lets the caller provide a `good_lp` solver backend.
+    /// Like [`LpExtractor::solve_multiple`], but lets the caller provide a `good_lp` solver backend.
     /// Example: `solve_multiple_with(roots, good_lp::highs)`.
     pub fn solve_multiple_with<S: Solver>(
         &mut self,
@@ -336,7 +336,7 @@ where
         self.extract_solution::<S>(solution, &vars, roots)
     }
 
-    /// Like [`solve_multiple_with`], but lets the caller provide a time limit for the 'good_lp' solver in seconds.
+    /// Like [`LpExtractor::solve_multiple_with`], but lets the caller provide a time limit for the 'good_lp' solver in seconds.
     /// Example: `solve_multiple_with_timeout(roots, good_lp::highs, 600.0)`.
     pub fn solve_multiple_with_timeout<S: Solver>(
         &mut self,

src/machine.rs

@@ -334,11 +334,7 @@ impl<L: Language> Program<L> {
                         .collect();
                     matches.push(Subst { vec: subst_vec });
                     limit -= 1;
-                    if limit != 0 {
-                        Ok(())
-                    } else {
-                        Err(())
-                    }
+                    if limit != 0 { Ok(()) } else { Err(()) }
                 },
             )
             .unwrap_or_default();

src/multipattern.rs

@@ -106,7 +106,7 @@ impl<L: Language, A: Analysis<L>> Searcher<L, A> for MultiPattern<L> {
         egraph: &EGraph<L, A>,
         eclass: Id,
         limit: usize,
-    ) -> Option<SearchMatches<L>> {
+    ) -> Option<SearchMatches<'_, L>> {
         match self.asts.as_slice() {
             [] => panic!("empty multipattern"),
             [(_var, pat), ..] => {