workspace: update dependencies (#2650)

Co-authored-by: Máté Kovács <481354+mkovaxx@users.noreply.github.com>
Co-authored-by: Mate Kovacs <mkovaxx@gmail.com>

Author: bsdinis

source/Cargo.lock

@@ -28,51 +28,59 @@ exclude = [
 tag = "workspace"
 
 [workspace.dependencies]
-anyhow = "1.0"
-bincode = "1.0.1"
+anyhow = "1.0.103"
+bincode-next = { version = "3.1", features = ["serde"] }
 cargo_metadata = "0.23.1"
 chrono = "0.4.41"
 clap-cargo = { version = "0.18.3", features = ["clap", "cargo_metadata"] }
-clap = { version = "4.5.53", features = ["derive"] }
-colored = "3.0.0"
-console = { version = "0.15", default-features = false, features = ["ansi-parsing"] }
+clap = { version = "4.6.1", features = ["derive"] }
+colored = "3.1"
+console = { version = "0.16", default-features = false, features = ["ansi-parsing"] }
 convert_case = "0.4"
 crates_io_api = "0.12.0"
 getopts = { git = "https://github.com/utaal/getopts.git", branch = "parse-partial" }
-git2 = { version = "0.18", default-features = false, features = [] }
+git2 = { version = "0.21", default-features = false, features = [] }
 hex = "0.4.3"
-html5ever = "0.25.2"
+html5ever = "0.26" # TODO: kuchikiki depends on 0.26
 im = "15.1.0"
-indexmap = "1"
-indicatif = "0.17.7"
+indexmap = "2"
+indicatif = "0.18"
 indoc = "2.0.7"
-is-terminal = { version = "0.4.9" }
-itertools = "0.14.0"
-kuchiki = "0.8.1"
-num-bigint = { version = "0.4.4", features = ["serde"] }
-num-format = "0.4.0"
+is-terminal = "0.4.17"
+itertools = "0.15.0"
+# kuchikiki has a shakey maintainability story, would be great to remove
+# it is transitively using an old version of html5ever and of rand (which has as security advisory)
+kuchikiki = "0.8.2"
+num-bigint = { version = "0.5.1", features = ["serde"] }
+num-format = "0.4.4"
 num-traits= "0.2.16"
 petgraph = "0.6"
-proc-macro2 = "1.0.39"
+proc-macro2 = "1.0.106"
 quote = "1.0"
-rand = { version = "0.8.0" }
-regex = "1.11"
-rustc_tools_util = "0.3.0"
-serde_json = { version = "1.0.145", features = ["preserve_order"] }
+rand = "0.10"
+regex = "1.13"
+rustc_tools_util = "0.4"
+serde_json = { version = "1.0.150", features = ["preserve_order"] }
 serde = { version = "1", features = ["std", "derive", "rc"] }
-sha2 = "0.10.2"
-sise = "0.6.0"
+sha2 = "0.11"
+sise = "0.8.0"
+# smt-scope is using very outdated dependencies and seems unmaintained
+# it is using:
+# - petgraph 0.6
+# - instant (unmaintained) -- transitive
+# - fxhash (unmaintained)
+# - bincode (unmaintained)
+# - proc-macro-error (unmaintained) -- transitive
 smt-scope = { version = "0.1.7", features = ["analysis"] }
 synstructure = "0.13.2"
 syn = { version = "2.0", features = ["full", "visit", "visit-mut", "extra-traits"] }
-tabled = "0.14.0"
-tempfile = "3.23"
+tabled = "0.21.0"
+tempfile = "3.27"
 toml = "1.1.2"
 toml_edit = { version = "0.23.3", features = ["serde"] }
-tracing = "0.1"
-walkdir = "2.3.2"
-yansi = "0.5"
-zip = "0.6.6"
+walkdir = "2.5"
+yansi = "1"
+zip = "8.6"
 
 # internal dependencies
 air = { path = "air" }

source/Cargo.toml

@@ -12,7 +12,7 @@ use crate::scope_map::ScopeMap;
 use crate::smt_process::SmtProcess;
 use crate::smt_verify::ReportLongRunning;
 use crate::typecheck::Typing;
-use sise::Node;
+use sise::TreeNode as Node;
 use std::any::Any;
 use std::collections::HashSet;
 use std::sync::Arc;
@@ -527,7 +527,7 @@ impl Context {
         }
     }
 
-    pub fn eval_expr(&mut self, expr: sise::Node) -> String {
+    pub fn eval_expr(&mut self, expr: sise::TreeNode) -> String {
         self.smt_log.log_eval(expr);
         let smt_data = self.smt_log.take_pipe_data();
         let smt_output = self.get_smt_process().send_commands(smt_data);

source/air/src/context.rs

@@ -2,7 +2,7 @@ use crate::ast::{Decl, Expr, Ident, Query};
 use crate::context::SmtSolver;
 use crate::printer::{NodeWriter, Printer, macro_push_node};
 use crate::{node, nodes};
-use sise::Node;
+use sise::TreeNode as Node;
 use std::io::Write;
 
 pub(crate) struct Emitter {

source/air/src/emitter.rs

@@ -4,7 +4,7 @@ use air::context::{Context, SmtSolver, ValidityResult};
 use air::messages::{AirMessage, AirMessageLabel, Reporter};
 use air::profiler::{PROVER_LOG_FILE, Profiler};
 use getopts::Options;
-use sise::Node;
+use sise::TreeNode as Node;
 use std::fs::File;
 use std::io::Read;
 
@@ -82,18 +82,18 @@ pub fn main() {
 
     // Open input file
     let in_filename = &matches.free[0];
-    let mut in_bytes: Vec<u8> = Vec::new();
-    in_bytes.push('(' as u8);
+    let mut in_string = String::new();
+    in_string.push('(');
     {
         File::open(in_filename)
-            .and_then(|mut file| file.read_to_end(&mut in_bytes))
+            .and_then(|mut file| file.read_to_string(&mut in_string))
             .unwrap_or_else(|e| panic!("could not read file {}: {:?}", in_filename, e));
     }
-    in_bytes.push(')' as u8);
+    in_string.push(')');
 
     // Parse input file to vector of Node
-    let mut parser = sise::Parser::new(&in_bytes);
-    let node = sise::read_into_tree(&mut parser).unwrap();
+    let mut parser = sise::Parser::new(in_string.as_str());
+    let node = sise::parse_tree(&mut parser).unwrap();
     let nodes = match node {
         Node::Atom(_) => panic!("internal error: nodes"),
         Node::List(nodes) => nodes,

source/air/src/main.rs

@@ -7,8 +7,7 @@ use crate::def::mk_skolem_id;
 use crate::messages::ArcDynMessageLabel;
 use crate::model::{ModelDef, ModelDefX, ModelDefs};
 use crate::printer::node_to_string;
-use sise::Node;
-use std::io::Write;
+use sise::TreeNode as Node;
 use std::sync::Arc;
 
 // Following SMT-LIB syntax specification
@@ -577,19 +576,21 @@ impl Parser {
         }
         match (qid.clone(), skolemid) {
             (Some(q), Some(skolem)) => {
-                let expected_skolemid = mk_skolem_id(&q);
+                let expected_skolemid = mk_skolem_id(q.as_str());
                 if skolem == expected_skolemid {
                     Ok((Arc::new(triggers), qid))
                 } else {
                     Err(format!(
                         "for qid {}, expected skolemid {}; found {}",
-                        q, expected_skolemid, skolem
+                        q.as_str(),
+                        expected_skolemid,
+                        skolem
                     ))
                 }
             }
             (Some(q), None) => Err(format!(
                 "for qid {}, expected skolemid {} but found no skolemid at all",
-                q,
+                q.as_str(),
                 mk_skolem_id(&q)
             )),
             (None, Some(_)) => Err(format!("skolemid must be accompanied by a qid")),
@@ -882,11 +883,8 @@ impl Parser {
 }
 
 pub(crate) fn parse_sexpression(lines: &Vec<String>) -> Node {
-    let mut model_bytes: Vec<u8> = Vec::new();
-    for line in lines {
-        writeln!(model_bytes, "{}", line).expect("model_bytes");
-    }
-    let mut parser = sise::Parser::new(&model_bytes[..]);
-    let node = sise::read_into_tree(&mut parser).unwrap();
+    let expr = lines.join("\n");
+    let mut parser = sise::Parser::new(expr.as_str());
+    let node = sise::parse_tree(&mut parser).unwrap();
     node
 }

source/air/src/parser.rs

@@ -6,7 +6,7 @@ use crate::ast::{
 use crate::context::SmtSolver;
 use crate::def::mk_skolem_id;
 use crate::util::vec_map;
-use sise::{Node, Writer};
+use sise::TreeNode as Node;
 use std::sync::Arc;
 
 pub fn str_to_node(s: &str) -> Node {
@@ -580,23 +580,22 @@ impl NodeWriter {
 
     pub fn write_node(
         &mut self,
-        writer: &mut sise::SpacedStringWriter,
+        serializer: &mut sise::Serializer,
         node: &Node,
         break_len: usize,
         brk: bool,
     ) {
-        let opts =
-            sise::SpacedStringWriterNodeOptions { break_line_len: if brk { 0 } else { break_len } };
+        let break_line_at = if brk { 0 } else { break_len };
         match node {
             Node::Atom(a) => {
-                writer.write_atom(a, opts).unwrap();
+                serializer.put_atom(a, break_line_at);
             }
             Node::List(l) => {
-                writer.begin_list(opts).unwrap();
+                serializer.begin_list(break_line_at);
                 let mut brk = false;
                 let mut was_pattern = false;
                 for n in l {
-                    self.write_node(writer, n, break_len + 1, brk && !was_pattern);
+                    self.write_node(serializer, n, break_len + 1, brk && !was_pattern);
                     was_pattern = false;
                     match n {
                         Node::Atom(a)
@@ -621,21 +620,19 @@ impl NodeWriter {
                         _ => {}
                     }
                 }
-                writer.end_list(()).unwrap();
+                serializer.end_list();
             }
         }
     }
 
     pub fn node_to_string_indent(&mut self, indent: &String, node: &Node) -> String {
         let indentation = " ";
-        let style = sise::SpacedStringWriterStyle {
-            line_break: &("\n".to_string() + &indent),
-            indentation,
-        };
+        let style =
+            sise::SerializerStyle { line_break: &("\n".to_string() + &indent), indentation };
         let mut result = String::new();
-        let mut string_writer = sise::SpacedStringWriter::new(style, &mut result);
-        self.write_node(&mut string_writer, &node, 80, false);
-        string_writer.finish(()).unwrap();
+        let mut serializer = sise::Serializer::new(style, &mut result);
+        self.write_node(&mut serializer, &node, 80, false);
+        serializer.finish(false);
         // Clean up result:
         clean_up_lines(result, indentation)
     }

source/air/src/printer.rs

@@ -1,3 +1,5 @@
+use yansi::Paint;
+
 use crate::context::SmtSolver;
 use std::io::{BufRead, BufReader, Write};
 use std::process::{Child, ChildStdin, ChildStdout};
@@ -121,10 +123,11 @@ impl SmtProcess {
             Err(err) => {
                 eprintln!(
                     "{}",
-                    yansi::Paint::red(format!(
+                    format!(
                         "error: could not execute {} process ({})",
                         solver_info.executable_name, err
-                    ))
+                    )
+                    .red()
                 );
                 eprintln!(
                     "help: {name} needs to be in the PATH, or the environment variable {var} must be set to the path of the {name} executable",

source/air/src/smt_process.rs

@@ -6,10 +6,10 @@ use crate::parser::Parser;
 #[allow(unused_imports)]
 use crate::printer::{macro_push_node, str_to_node};
 #[allow(unused_imports)]
-use sise::Node;
+use sise::TreeNode as Node;
 
 #[allow(dead_code)]
-fn run_nodes_as_test(should_typecheck: bool, should_be_valid: bool, nodes: &[Node]) {
+fn run_nodes_as_test(should_typecheck: bool, should_be_valid: bool, nodes: &[sise::TreeNode]) {
     let message_interface = std::sync::Arc::new(crate::messages::AirMessageInterface {});
     let reporter = Reporter {};
     // TODO: Support testing with cvc5 too

source/air/src/tests.rs

@@ -7,7 +7,7 @@ edition = "2024"
 
 [dependencies]
 air = { workspace = true }
-bincode = { workspace = true }
+bincode-next = { workspace = true }
 console = { workspace = true }
 getopts = { git = "https://github.com/utaal/getopts.git", branch = "parse-partial" }
 hex = { workspace = true }