update all dependencies, fix one break with latest ros-z

0x53A · 0x53A · commit 1daf1f06b17e · 2026-01-24T21:06:11.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/roslibrust/Cargo.toml b/roslibrust/Cargo.toml
@@ -34,7 +34,7 @@ roslibrust_codegen_macro = { path = "../roslibrust_codegen_macro" }
 # Slightly weird, but used in documentation examples
 roslibrust_test = { path = "../roslibrust_test" }
 # Slightly weird, but used in documentation examples
-zenoh = "1.0"
+zenoh = "1.7"
 # Provides test timeout
 ntest = "0.9"
 
diff --git a/roslibrust_codegen/Cargo.toml b/roslibrust_codegen/Cargo.toml
@@ -16,14 +16,14 @@ categories = ["science::robotics"]
 log = { workspace = true }
 serde = { workspace = true }
 roslibrust_common = { path = "../roslibrust_common", version = "0.19.0" }
-lazy_static = "1.4"
+lazy_static = "1.5"
 md5 = "0.7"
 proc-macro2 = "1.0"
 quote = "1.0"
 serde_json = "1.0"
 simple-error = "0.3"
 syn = "1.0"
-walkdir = "2.3"
+walkdir = "2.5"
 xml-rs = "0.8"
 # Not a direct dependencies of the crate, but something generated code uses
 # We include them as dependencies here and expose them with a `pub use`
diff --git a/roslibrust_common/Cargo.toml b/roslibrust_common/Cargo.toml
@@ -21,4 +21,4 @@ futures-core = "0.3"
 # Used for implementation of into_stream for subscribers
 async-stream = "0.3"
 # Used for validation of topic names
-regex = "1.9"
+regex = "1.12"
diff --git a/roslibrust_genmsg/Cargo.toml b/roslibrust_genmsg/Cargo.toml
@@ -21,11 +21,11 @@ path = "src/main.rs"
 log = { workspace = true }
 serde = { workspace = true }
 roslibrust_codegen = { path = "../roslibrust_codegen", version = "0.19" }
-clap = { version = "4.1", features = ["derive"] }
+clap = { version = "4.5", features = ["derive"] }
 env_logger = "0.11"
 itertools = "0.12"
-lazy_static = "1.4"
-minijinja = "2.0"
+lazy_static = "1.5"
+minijinja = "2.14"
 serde_json = "1"
 
 [dev-dependencies]
diff --git a/roslibrust_ros1/Cargo.toml b/roslibrust_ros1/Cargo.toml
@@ -18,7 +18,7 @@ log = { workspace = true }
 serde = { workspace = true }
 
 # Should probably become workspace members:
-lazy_static = "1.4"
+lazy_static = "1.5"
 abort-on-drop = "0.2"
 test-log = { workspace = true }
 
@@ -28,9 +28,9 @@ serde_xmlrpc = { version = "0.2" }
 roslibrust_serde_rosmsg = { workspace = true }
 hyper = { version = "0.14", features = ["server"] }
 gethostname = { version = "0.4" }
-regex = { version = "1.9" }
-byteorder = "1.4"
-bytes = "1.5"
+regex = { version = "1.12" }
+byteorder = "1.5"
+bytes = "1.11"
 thiserror = "2.0"
 anyhow = "1.0"
 getifs = "0.4"
diff --git a/roslibrust_ros2/Cargo.toml b/roslibrust_ros2/Cargo.toml
@@ -5,7 +5,8 @@ edition = "2021"
 publish = false
 
 [dependencies]
-zenoh = "1.5"
+zenoh = "1.7"
+zenoh-buffers = "1.7"
 tokio = { workspace = true }
 env_logger = "0.11"
 cdr = "0.2"
diff --git a/roslibrust_ros2/src/lib.rs b/roslibrust_ros2/src/lib.rs
@@ -38,6 +38,14 @@ impl<T: RosMessageType> ros_z::msg::ZSerializer for WrapperSerdes<T> {
     fn serialize(input: Self::Input<'_>) -> Vec<u8> {
         ros_z::msg::CdrSerdes::<T>::serialize(&input.0)
     }
+
+    fn serialize_to_zbuf(input: Self::Input<'_>) -> zenoh_buffers::ZBuf {
+        ros_z::msg::CdrSerdes::<T>::serialize_to_zbuf(&input.0)
+    }
+
+    fn serialize_to_buf(input: Self::Input<'_>, buffer: &mut Vec<u8>) {
+        ros_z::msg::CdrSerdes::<T>::serialize_to_buf(&input.0, buffer)
+    }
 }
 
 impl<T: RosMessageType> ros_z::msg::ZDeserializer for WrapperSerdes<T> {
diff --git a/roslibrust_rosbridge/Cargo.toml b/roslibrust_rosbridge/Cargo.toml
@@ -13,14 +13,14 @@ roslibrust_common = { path = "../roslibrust_common", version = "0.19" }
 tokio = { workspace = true }
 log = { workspace = true }
 tokio-tungstenite = { version = "0.17" }
-uuid = { version = "1.1", features = ["v4"] }
+uuid = { version = "1.19", features = ["v4"] }
 serde_json = "1.0"
 serde = "1.0"
 anyhow = "1.0"
 futures = "0.3"
 futures-util = "0.3"
-dashmap = "5.3"
-deadqueue = "0.2.4" # .4+ is required to fix bug with missing tokio dep
+dashmap = "5.5"
+deadqueue = "0.2.5" # .4+ is required to fix bug with missing tokio dep
 
 [dev-dependencies]
 test-log = { workspace = true }
diff --git a/roslibrust_test/Cargo.toml b/roslibrust_test/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 [dependencies]
 env_logger = "0.10"
 roslibrust = { path = "../roslibrust", features = ["ros1", "codegen", "macro", "mock"] }
-lazy_static = "1.4"
+lazy_static = "1.5"
 tokio = { workspace = true }
 log = { workspace = true }
 
diff --git a/roslibrust_zenoh/Cargo.toml b/roslibrust_zenoh/Cargo.toml
@@ -15,7 +15,7 @@ roslibrust_serde_rosmsg = { workspace = true }
 log = { workspace = true }
 tokio = { workspace = true }
 roslibrust_common = { path = "../roslibrust_common", version = "0.19" }
-zenoh = "1.0"
+zenoh = "1.7"
 hex = "0.4"
 anyhow = "1.0"
 

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,14 @@ impl<T: RosMessageType> ros_z::msg::ZSerializer for WrapperSerdes<T> {`
`38`	`38`	`fn serialize(input: Self::Input<'_>) -> Vec<u8> {`
`39`	`39`	`ros_z::msg::CdrSerdes::<T>::serialize(&input.0)`
`40`	`40`	`}`
	`41`	`+`
	`42`	`+ fn serialize_to_zbuf(input: Self::Input<'_>) -> zenoh_buffers::ZBuf {`
	`43`	`+ ros_z::msg::CdrSerdes::<T>::serialize_to_zbuf(&input.0)`
	`44`	`+ }`
	`45`	`+`
	`46`	`+ fn serialize_to_buf(input: Self::Input<'_>, buffer: &mut Vec<u8>) {`
	`47`	`+ ros_z::msg::CdrSerdes::<T>::serialize_to_buf(&input.0, buffer)`
	`48`	`+ }`
`41`	`49`	`}`
`42`	`50`
`43`	`51`	`impl<T: RosMessageType> ros_z::msg::ZDeserializer for WrapperSerdes<T> {`