Merge pull request #206 from plaans/deps-update

build: Update dependencies and rust edition

Author: arbimo

Cargo.lock

@@ -25,43 +25,44 @@ anyhow = { version = "1.0" }
 arcstr = { version = "1.2" }
 async-trait = "0.1"
 bumpalo = { version = "3.19" }
-clap = { version = "4.4", features = ["derive"] }
+clap = { version = "4.5", features = ["derive"] }
 crossbeam-channel = "0.5"
 derivative = "2.2"
 itertools = { version = "0.14" }
 fixedbitset = { version = "0.5.7", default-features = false }
 format_num = "0.1.0"
-hashbrown = "0.15"
+hashbrown = "0.16"
 im = "15.1"
-lru = "0.14"
-malachite = "0.4.14"
-num-rational = { version = "0.4.1" }
-num-integer = { default-features = false, version = "0.1.44" }
-pathfinding = "4.9.1"
-prost = { version = "0.12" }
-rand = { version = "0.8", features = ["small_rng"] }
+lru = "0.16"
+malachite = "0.9.0"
+num-rational = { version = "0.4.2" }
+num-integer = { default-features = false, version = "0.1.46" }
+pathfinding = "4.14.0"
+prost = { version = "0.14" }
+rand = { version = "0.9", features = ["small_rng"] }
 regex = { version = "1" }
 smallvec = { version = "1.15", features = ["union"] }
 structopt = "0.3"
-streaming-iterator = "0.1.5"
-test_each_file = "0.3.4"
-tonic = "0.11.0"
-tonic-build = "0.11.0"
-tokio = { default-features = false, version = "1.38.0", features = [
+streaming-iterator = "0.1.9"
+test_each_file = "0.3.6"
+tonic = "0.14.2"
+tonic-prost = "0.14.2"
+tonic-prost-build = "0.14.2"
+tokio = { default-features = false, version = "1.49.0", features = [
     "rt-multi-thread",
     "macros",
 ] }
 tokio-stream = { default-features = false, version = "0.1" }
 tracing = { version = "0.1", features = ["release_max_level_debug"] }
 tracing-subscriber = "0.3"
-transitive = "1.1.0"
+transitive = "1.2.0"
 vec_map = "0.8"
-walkdir = "2.3"
-zip = { default-features = false, features = ["deflate"], version = "2.1.3" }
-derive_more = { version = "1.0", features = ["display"] }
+walkdir = "2.5"
+zip = { default-features = false, features = ["deflate"], version = "7.0.0" }
+derive_more = { version = "2.1", features = ["display"] }
 thiserror = "2"
-annotate-snippets = "0.12.4"
-idmap = "0.3.0"
+annotate-snippets = "0.12.10"
+idmap = "0.3.5"
 compact_str = "0.9.0"
 
 [profile.dev]

Cargo.toml

@@ -6,8 +6,9 @@ use crate::fzn::var::BasicVar;
 /// ```flatzinc
 /// solve satisfy;
 /// ```
-#[derive(PartialEq, Debug)]
+#[derive(PartialEq, Debug, Default)]
 pub enum SolveItem {
+    #[default]
     Satisfy,
     Optimize(Objective),
 }
@@ -32,12 +33,6 @@ impl SolveItem {
     }
 }
 
-impl Default for SolveItem {
-    fn default() -> Self {
-        Self::Satisfy
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use crate::fzn::domain::BoolDomain;

aries_fzn/src/fzn/solve/solve_item.rs

@@ -7,4 +7,4 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-once_cell = "1.5.2"
+once_cell = "1.21.3"

env_param/Cargo.toml

@@ -8,10 +8,11 @@ version = "0.1.0"
 [dependencies]
 prost = { workspace = true }
 tonic = { workspace = true }
+tonic-prost = { workspace = true }
 itertools = { workspace = true }
 
 [build-dependencies]
-tonic-build = { workspace = true, optional = true }
+tonic-prost-build = { workspace = true, optional = true }
 
 [features]
-generate_bindings = ["tonic-build"]
+generate_bindings = ["tonic-prost-build"]

planning/grpc/api/Cargo.toml

@@ -5,11 +5,11 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let proto_file = "src/unified_planning.proto";
 
     let x: [&str; 0] = [];
-    tonic_build::configure()
+    tonic_prost_build::configure()
         .build_server(true)
         .build_client(true)
         .out_dir("src/")
-        .compile(&[proto_file], &x)
+        .compile_protos(&[proto_file], &x)
         .unwrap_or_else(|e| panic!("Failed to compile proto: {}", e));
 
     fs::rename("src/_.rs", "src/unified_planning.rs")?;