fix lints and update dep

Author: ezrosent

Cargo.toml

@@ -17,7 +17,7 @@ graphviz = ["dep:graphviz-rust"]
 [dependencies]
 indexmap = "2.0.0"
 once_cell = "1.18.0"
-ordered-float = "3.7.0"
+ordered-float = "5.0"
 
 [dependencies.serde]
 default-features = false

src/algorithms.rs

@@ -157,8 +157,7 @@ impl EGraph {
                     .partition(|node_id| should_split(node_id, &self.nodes[node_id]));
                 if unique_nodes.len() > 1 {
                     panic!(
-                        "Multiple nodes in one e-class should be split. E-class: {:?} Nodes: {:?}",
-                        id, unique_nodes
+                        "Multiple nodes in one e-class should be split. E-class: {id:?} Nodes: {unique_nodes:?}"
                     );
                 }
                 let unique_node = unique_nodes.into_iter().next();
@@ -175,7 +174,7 @@ impl EGraph {
                     for other_node_id in other_nodes.into_iter().skip(1) {
                         changed = true;
                         // use same ID for new class and new node added to that class
-                        let new_id = format!("split-{}-{}", offset, unique_node_id);
+                        let new_id = format!("split-{offset}-{unique_node_id}");
                         offset += 1;
                         let new_class_id: ClassId = new_id.clone().into();
                         // Copy the class data if it exists
@@ -196,7 +195,7 @@ impl EGraph {
                         continue;
                     }
                     changed = true;
-                    let new_id = format!("split-{}-{}", offset, unique_node_id);
+                    let new_id = format!("split-{offset}-{unique_node_id}");
                     let new_class_id: ClassId = new_id.clone().into();
                     // Copy the class data if it exists
                     if let Some(class_data) = &class_data {

src/graphviz.rs

@@ -90,7 +90,7 @@ impl EGraph {
                 // Add nodes
                 for (node_id, node) in nodes {
                     let label = node.op.as_ref();
-                    let tooltip = format!("{}: {}", class_id, node_id);
+                    let tooltip = format!("{class_id}: {node_id}");
                     let html_label = html_label(label, node.children.len());
                     let quoted_tooltip = quote(&tooltip);
                     let quoted_node_id = quote(node_id.as_ref());
@@ -99,7 +99,7 @@ impl EGraph {
                         let source = node_id!(quoted_node_id, port!(id!(i), "s"));
                         let target = node_id!(quote(child.as_ref()));
                         let child_eclass = node_to_class.get(child).unwrap();
-                        let child_subgraph_id = format!("cluster_{}", child_eclass);
+                        let child_subgraph_id = format!("cluster_{child_eclass}");
                         let edge = edge!(source => target; EdgeAttributes::lhead(quote(&child_subgraph_id)));
                         // Make sure edge is part of outer statements so it doesn't add nodes to the subgraph which
                         // don't belong there
@@ -109,8 +109,8 @@ impl EGraph {
                     inner_stmts.push(stmt!(node));
                 }
 
-                let subgraph_id = format!("cluster_{}", class_id);
-                let outer_subgraph_id = quote(&format!("outer_{}", subgraph_id));
+                let subgraph_id = format!("cluster_{class_id}");
+                let outer_subgraph_id = quote(&format!("outer_{subgraph_id}"));
                 let quoted_subgraph_id = quote(&subgraph_id);
 
                 let subgraph = subgraph!(outer_subgraph_id;
@@ -150,15 +150,15 @@ const INITIAL_COLOR: usize = 2;
 fn html_label(label: &str, n_args: usize) -> String {
     format!(
         "<<TABLE BGCOLOR=\"white\" CELLBORDER=\"0\" CELLSPACING=\"0\" CELLPADDING=\"0\" style=\"rounded\"><tr><td BALIGN=\"left\" CELLPADDING=\"4\" WIDTH=\"30\" HEIGHT=\"30\"{}>{}</td></tr>{}</TABLE>>",
-        (if n_args  == 0 {"".to_string()} else {format!(" colspan=\"{}\"", n_args)}),
+        (if n_args  == 0 {"".to_string()} else {format!(" colspan=\"{n_args}\"")}),
         Escape(label),
         (if n_args == 0 {
             "".to_string()
         } else {
             format!(
                 "<TR>{}</TR>",
                 (0..n_args)
-                    .map(|i| format!("<TD PORT=\"{}\"></TD>", i))
+                    .map(|i| format!("<TD PORT=\"{i}\"></TD>"))
                     .collect::<Vec<String>>()
                     .join("")
             )
@@ -168,7 +168,7 @@ fn html_label(label: &str, n_args: usize) -> String {
 
 /// Adds double quotes and escapes the quotes in the string
 fn quote(s: &str) -> String {
-    format!("{:?}", s)
+    format!("{s:?}")
 }
 
 // Copied from https://doc.rust-lang.org/stable/nightly-rustc/src/rustdoc/html/escape.rs.html#10

src/lib.rs

@@ -148,7 +148,7 @@ impl std::ops::Index<&NodeId> for EGraph {
     fn index(&self, index: &NodeId) -> &Self::Output {
         self.nodes
             .get(index)
-            .unwrap_or_else(|| panic!("No node with id {:?}", index))
+            .unwrap_or_else(|| panic!("No node with id {index:?}"))
     }
 }
 
@@ -158,7 +158,7 @@ impl std::ops::Index<&ClassId> for EGraph {
     fn index(&self, index: &ClassId) -> &Self::Output {
         self.classes()
             .get(index)
-            .unwrap_or_else(|| panic!("No class with id {:?}", index))
+            .unwrap_or_else(|| panic!("No class with id {index:?}"))
     }
 }
 

tests/round_trip.rs

@@ -1,13 +1,12 @@
-use std::path::Path;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 
 use egraph_serialize::*;
 
 #[test]
 fn test_round_trip() {
     let mut n_tested = 0;
     for entry in test_files() {
-        println!("Testing {:?}", entry);
+        println!("Testing {entry:?}");
         let egraph = EGraph::from_json_file(entry.as_path()).unwrap();
         egraph.test_round_trip();
         n_tested += 1;
@@ -26,7 +25,7 @@ fn test_graphviz() {
 
     let mut names = Vec::new();
     for entry in test_files() {
-        println!("Testing graphviz {:?}", entry);
+        println!("Testing graphviz {entry:?}");
         let mut egraph = EGraph::from_json_file(entry.as_path()).unwrap();
         names.push(entry.file_stem().unwrap().to_str().unwrap().to_string());
 
@@ -38,9 +37,9 @@ fn test_graphviz() {
                 .join(entry.file_name().unwrap())
                 .with_extension("svg");
             if path.exists() {
-                println!("Skipping {:?}", path);
+                println!("Skipping {path:?}");
             } else {
-                println!("Writing to {:?}", path);
+                println!("Writing to {path:?}");
                 egraph.to_svg_file(path).unwrap();
             }
         }
@@ -55,9 +54,9 @@ fn test_graphviz() {
                 entry.file_stem().unwrap().to_str().unwrap()
             ));
             if path.exists() {
-                println!("Skipping {:?}", path);
+                println!("Skipping {path:?}");
             } else {
-                println!("Writing to {:?}", path);
+                println!("Writing to {path:?}");
                 egraph.to_svg_file(path).unwrap();
             }
         }
@@ -72,9 +71,9 @@ fn test_graphviz() {
                 entry.file_stem().unwrap().to_str().unwrap()
             ));
             if path.exists() {
-                println!("Skipping {:?}", path);
+                println!("Skipping {path:?}");
             } else {
-                println!("Writing to {:?}", path);
+                println!("Writing to {path:?}");
                 egraph.to_svg_file(path).unwrap();
             }
         }
@@ -93,8 +92,7 @@ This is a list of all the tests in the `tests` directory. Each test is a JSON fi
             .iter()
             .map(|name| {
                 format!(
-                    "| [`{}`](../tests/{}.json) | ![svg file](./{}.svg) | ![inlined leaves svg file](./{}-inlined.svg) | ![inlined leaves saturated svg file](./{}-inlined-saturated.svg) |",
-                    name, name, name, name, name
+                    "| [`{name}`](../tests/{name}.json) | ![svg file](./{name}.svg) | ![inlined leaves svg file](./{name}-inlined.svg) | ![inlined leaves saturated svg file](./{name}-inlined-saturated.svg) |"
                 )
             })
             .collect::<Vec<_>>()