Merge branch 'attachment' into attachment-api

Cargo.toml

@@ -84,9 +84,9 @@ const_format = "0.2.30"
 crc = "3.0.1"
 criterion = "0.5"
 derive_more = "0.99.17"
-derive-new = "0.5.9"
+derive-new = "0.6.0"
 env_logger = "0.10.0"
-event-listener = "2.5.3"
+event-listener = "4.0.0"
 flume = "0.11"
 form_urlencoded = "1.1.0"
 futures = "0.3.25"
@@ -108,7 +108,7 @@ log = "0.4.17"
 lz4_flex = "0.11"
 nix = { version = "0.27", features = ["fs"] }
 num_cpus = "1.15.0"
-ordered-float = "3.4.0"
+ordered-float = "4.1.1"
 panic-message = "0.3.0"
 paste = "1.0.12"
 petgraph = "0.6.3"
@@ -125,8 +125,9 @@ ringbuffer-spsc = "0.1.9"
 rsa = "0.9"
 rustc_version = "0.4.0"
 rustls = { version = "0.21.5", features = ["dangerous_configuration"] }
-rustls-native-certs = "0.6.2"
-rustls-pemfile = "1.0.2"
+rustls-native-certs = "0.7.0"
+rustls-pemfile = "2.0.0"
+rustls-webpki = "0.102.0"
 schemars = "0.8.12"
 secrecy = { version = "0.8.0", features = ["serde", "alloc"] }
 serde = { version = "1.0.154", default-features = false, features = [
@@ -154,8 +155,7 @@ uuid = { version = "1.3.0", default-features = false, features = [
 ] } # Default features are disabled due to usage in no_std crates
 validated_struct = "2.1.0"
 vec_map = "0.8.2"
-rustls-webpki = "0.101.4"
-webpki-roots = "0.25"
+webpki-roots = "0.26.0"
 winapi = { version = "0.3.9", features = ["iphlpapi"] }
 z-serial = "0.2.1"
 zenoh-ext = { version = "0.11.0-dev", path = "zenoh-ext" }

commons/zenoh-sync/src/condition.rs

@@ -13,9 +13,9 @@
 //
 use async_std::sync::MutexGuard as AysncMutexGuard;
 use event_listener::{Event, EventListener};
-use std::sync::MutexGuard;
+use std::{pin::Pin, sync::MutexGuard};
 
-pub type ConditionWaiter = EventListener;
+pub type ConditionWaiter = Pin<Box<EventListener>>;
 /// This is a Condition Variable similar to that provided by POSIX.
 /// As for POSIX condition variables, this assumes that a mutex is
 /// properly used to coordinate behaviour. In other terms there should

examples/examples/z_pub.rs

@@ -44,7 +44,7 @@ struct Args {
     #[arg(short, long, default_value = "demo/example/zenoh-rs-pub")]
     /// The key expression to write to.
     key: KeyExpr<'static>,
-    #[arg(short, long, default_value = "Put from Rust")]
+    #[arg(short, long, default_value = "Pub from Rust!")]
     /// The value to write.
     value: String,
     #[command(flatten)]

examples/examples/z_put.rs

@@ -35,7 +35,7 @@ struct Args {
     #[arg(short, long, default_value = "demo/example/zenoh-rs-put")]
     /// The key expression to write to.
     key: KeyExpr<'static>,
-    #[arg(short, long, default_value = "Put from Rust")]
+    #[arg(short, long, default_value = "Put from Rust!")]
     /// The value to write.
     value: String,
     #[command(flatten)]

examples/examples/z_queryable.rs

@@ -89,7 +89,7 @@ struct Args {
     #[arg(short, long, default_value = "demo/example/zenoh-rs-queryable")]
     /// The key expression matching queries to reply to.
     key: KeyExpr<'static>,
-    #[arg(short, long, default_value = "Queryable from Rust")]
+    #[arg(short, long, default_value = "Queryable from Rust!")]
     /// The value to reply to queries.
     value: String,
     #[arg(long)]