From b214c101f0944173d565fb1caf1c1ca958e3ebb5 Mon Sep 17 00:00:00 2001 From: eclipse-zenoh-bot <61247838+eclipse-zenoh-bot@users.noreply.github.com> Date: Wed, 22 May 2024 02:15:28 +0200 Subject: [PATCH 01/16] build: Sync with eclipse-zenoh/zenoh@25f06bd from 2024-05-21 (#119) Co-authored-by: eclipse-zenoh-bot --- Cargo.lock | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d80457a..c3d5e33 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3869,7 +3869,7 @@ dependencies = [ [[package]] name = "zenoh" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#75aa2739c36533f57b0eef3580256014e445f241" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" dependencies = [ "ahash", "async-trait", @@ -3972,7 +3972,7 @@ dependencies = [ [[package]] name = "zenoh-buffers" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#75aa2739c36533f57b0eef3580256014e445f241" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" dependencies = [ "zenoh-collections", ] @@ -3980,7 +3980,7 @@ dependencies = [ [[package]] name = "zenoh-codec" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#75aa2739c36533f57b0eef3580256014e445f241" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" dependencies = [ "serde", "tracing", @@ -3992,12 +3992,12 @@ dependencies = [ [[package]] name = "zenoh-collections" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#75aa2739c36533f57b0eef3580256014e445f241" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" [[package]] name = "zenoh-config" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#75aa2739c36533f57b0eef3580256014e445f241" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" dependencies = [ "flume", "json5", @@ -4017,7 +4017,7 @@ dependencies = [ [[package]] name = "zenoh-core" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#75aa2739c36533f57b0eef3580256014e445f241" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" dependencies = [ "async-global-executor", "lazy_static", @@ -4029,7 +4029,7 @@ dependencies = [ [[package]] name = "zenoh-crypto" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#75aa2739c36533f57b0eef3580256014e445f241" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" dependencies = [ "aes 0.8.3", "hmac 0.12.1", @@ -4042,7 +4042,7 @@ dependencies = [ [[package]] name = "zenoh-keyexpr" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#75aa2739c36533f57b0eef3580256014e445f241" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" dependencies = [ "hashbrown 0.14.0", "keyed-set", @@ -4056,7 +4056,7 @@ dependencies = [ [[package]] name = "zenoh-link" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#75aa2739c36533f57b0eef3580256014e445f241" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" dependencies = [ "async-trait", "zenoh-config", @@ -4074,7 +4074,7 @@ dependencies = [ [[package]] name = "zenoh-link-commons" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#75aa2739c36533f57b0eef3580256014e445f241" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" dependencies = [ "async-trait", "flume", @@ -4098,7 +4098,7 @@ dependencies = [ [[package]] name = "zenoh-link-quic" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#75aa2739c36533f57b0eef3580256014e445f241" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" dependencies = [ "async-trait", "base64 0.21.4", @@ -4128,7 +4128,7 @@ dependencies = [ [[package]] name = "zenoh-link-tcp" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#75aa2739c36533f57b0eef3580256014e445f241" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" dependencies = [ "async-trait", "tokio", @@ -4146,7 +4146,7 @@ dependencies = [ [[package]] name = "zenoh-link-tls" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#75aa2739c36533f57b0eef3580256014e445f241" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" dependencies = [ "async-trait", "base64 0.21.4", @@ -4174,7 +4174,7 @@ dependencies = [ [[package]] name = "zenoh-link-udp" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#75aa2739c36533f57b0eef3580256014e445f241" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" dependencies = [ "async-trait", "socket2 0.5.6", @@ -4195,7 +4195,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixsock_stream" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#75aa2739c36533f57b0eef3580256014e445f241" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" dependencies = [ "async-trait", "futures", @@ -4215,7 +4215,7 @@ dependencies = [ [[package]] name = "zenoh-link-ws" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#75aa2739c36533f57b0eef3580256014e445f241" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" dependencies = [ "async-trait", "futures-util", @@ -4236,7 +4236,7 @@ dependencies = [ [[package]] name = "zenoh-macros" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#75aa2739c36533f57b0eef3580256014e445f241" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" dependencies = [ "proc-macro2", "quote", @@ -4247,7 +4247,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-trait" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#75aa2739c36533f57b0eef3580256014e445f241" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" dependencies = [ "const_format", "libloading", @@ -4263,7 +4263,7 @@ dependencies = [ [[package]] name = "zenoh-protocol" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#75aa2739c36533f57b0eef3580256014e445f241" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" dependencies = [ "const_format", "rand 0.8.5", @@ -4277,7 +4277,7 @@ dependencies = [ [[package]] name = "zenoh-result" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#75aa2739c36533f57b0eef3580256014e445f241" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" dependencies = [ "anyhow", ] @@ -4285,7 +4285,7 @@ dependencies = [ [[package]] name = "zenoh-runtime" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#75aa2739c36533f57b0eef3580256014e445f241" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" dependencies = [ "futures", "lazy_static", @@ -4301,7 +4301,7 @@ dependencies = [ [[package]] name = "zenoh-sync" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#75aa2739c36533f57b0eef3580256014e445f241" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" dependencies = [ "event-listener 4.0.0", "futures", @@ -4315,7 +4315,7 @@ dependencies = [ [[package]] name = "zenoh-task" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#75aa2739c36533f57b0eef3580256014e445f241" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" dependencies = [ "futures", "tokio", @@ -4328,7 +4328,7 @@ dependencies = [ [[package]] name = "zenoh-transport" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#75aa2739c36533f57b0eef3580256014e445f241" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" dependencies = [ "async-trait", "flume", @@ -4360,7 +4360,7 @@ dependencies = [ [[package]] name = "zenoh-util" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#75aa2739c36533f57b0eef3580256014e445f241" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" dependencies = [ "async-std", "async-trait", @@ -4383,7 +4383,7 @@ dependencies = [ [[package]] name = "zenoh_backend_traits" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#75aa2739c36533f57b0eef3580256014e445f241" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" dependencies = [ "async-std", "async-trait", From a2521ecbca9765ed8991f552a7d62f41b226926e Mon Sep 17 00:00:00 2001 From: eclipse-zenoh-bot <61247838+eclipse-zenoh-bot@users.noreply.github.com> Date: Wed, 29 May 2024 02:16:07 +0200 Subject: [PATCH 02/16] build: Sync with eclipse-zenoh/zenoh@3118d31 from 2024-05-28 (#120) Co-authored-by: eclipse-zenoh-bot --- Cargo.lock | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c3d5e33..6149164 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3869,7 +3869,7 @@ dependencies = [ [[package]] name = "zenoh" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" dependencies = [ "ahash", "async-trait", @@ -3972,7 +3972,7 @@ dependencies = [ [[package]] name = "zenoh-buffers" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" dependencies = [ "zenoh-collections", ] @@ -3980,7 +3980,7 @@ dependencies = [ [[package]] name = "zenoh-codec" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" dependencies = [ "serde", "tracing", @@ -3992,12 +3992,12 @@ dependencies = [ [[package]] name = "zenoh-collections" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" [[package]] name = "zenoh-config" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" dependencies = [ "flume", "json5", @@ -4017,7 +4017,7 @@ dependencies = [ [[package]] name = "zenoh-core" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" dependencies = [ "async-global-executor", "lazy_static", @@ -4029,7 +4029,7 @@ dependencies = [ [[package]] name = "zenoh-crypto" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" dependencies = [ "aes 0.8.3", "hmac 0.12.1", @@ -4042,7 +4042,7 @@ dependencies = [ [[package]] name = "zenoh-keyexpr" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" dependencies = [ "hashbrown 0.14.0", "keyed-set", @@ -4056,7 +4056,7 @@ dependencies = [ [[package]] name = "zenoh-link" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" dependencies = [ "async-trait", "zenoh-config", @@ -4074,7 +4074,7 @@ dependencies = [ [[package]] name = "zenoh-link-commons" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" dependencies = [ "async-trait", "flume", @@ -4098,7 +4098,7 @@ dependencies = [ [[package]] name = "zenoh-link-quic" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" dependencies = [ "async-trait", "base64 0.21.4", @@ -4128,7 +4128,7 @@ dependencies = [ [[package]] name = "zenoh-link-tcp" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" dependencies = [ "async-trait", "tokio", @@ -4146,7 +4146,7 @@ dependencies = [ [[package]] name = "zenoh-link-tls" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" dependencies = [ "async-trait", "base64 0.21.4", @@ -4174,7 +4174,7 @@ dependencies = [ [[package]] name = "zenoh-link-udp" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" dependencies = [ "async-trait", "socket2 0.5.6", @@ -4195,7 +4195,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixsock_stream" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" dependencies = [ "async-trait", "futures", @@ -4215,7 +4215,7 @@ dependencies = [ [[package]] name = "zenoh-link-ws" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" dependencies = [ "async-trait", "futures-util", @@ -4236,7 +4236,7 @@ dependencies = [ [[package]] name = "zenoh-macros" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" dependencies = [ "proc-macro2", "quote", @@ -4247,7 +4247,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-trait" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" dependencies = [ "const_format", "libloading", @@ -4263,7 +4263,7 @@ dependencies = [ [[package]] name = "zenoh-protocol" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" dependencies = [ "const_format", "rand 0.8.5", @@ -4277,7 +4277,7 @@ dependencies = [ [[package]] name = "zenoh-result" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" dependencies = [ "anyhow", ] @@ -4285,7 +4285,7 @@ dependencies = [ [[package]] name = "zenoh-runtime" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" dependencies = [ "futures", "lazy_static", @@ -4301,7 +4301,7 @@ dependencies = [ [[package]] name = "zenoh-sync" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" dependencies = [ "event-listener 4.0.0", "futures", @@ -4315,7 +4315,7 @@ dependencies = [ [[package]] name = "zenoh-task" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" dependencies = [ "futures", "tokio", @@ -4328,7 +4328,7 @@ dependencies = [ [[package]] name = "zenoh-transport" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" dependencies = [ "async-trait", "flume", @@ -4360,7 +4360,7 @@ dependencies = [ [[package]] name = "zenoh-util" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" dependencies = [ "async-std", "async-trait", @@ -4383,7 +4383,7 @@ dependencies = [ [[package]] name = "zenoh_backend_traits" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#25f06bd9e71b4dbed5ba8d75eaa1708693e7b9ec" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" dependencies = [ "async-std", "async-trait", From d093bc1fff71469c3167664bb482b94b755bf1bb Mon Sep 17 00:00:00 2001 From: eclipse-zenoh-bot <61247838+eclipse-zenoh-bot@users.noreply.github.com> Date: Fri, 31 May 2024 02:15:24 +0200 Subject: [PATCH 03/16] build: Sync with eclipse-zenoh/zenoh@009f666 from 2024-05-30 (#122) Co-authored-by: eclipse-zenoh-bot --- Cargo.lock | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6149164..8ac4eb6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3869,7 +3869,7 @@ dependencies = [ [[package]] name = "zenoh" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" dependencies = [ "ahash", "async-trait", @@ -3972,7 +3972,7 @@ dependencies = [ [[package]] name = "zenoh-buffers" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" dependencies = [ "zenoh-collections", ] @@ -3980,7 +3980,7 @@ dependencies = [ [[package]] name = "zenoh-codec" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" dependencies = [ "serde", "tracing", @@ -3992,12 +3992,12 @@ dependencies = [ [[package]] name = "zenoh-collections" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" [[package]] name = "zenoh-config" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" dependencies = [ "flume", "json5", @@ -4017,7 +4017,7 @@ dependencies = [ [[package]] name = "zenoh-core" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" dependencies = [ "async-global-executor", "lazy_static", @@ -4029,7 +4029,7 @@ dependencies = [ [[package]] name = "zenoh-crypto" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" dependencies = [ "aes 0.8.3", "hmac 0.12.1", @@ -4042,7 +4042,7 @@ dependencies = [ [[package]] name = "zenoh-keyexpr" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" dependencies = [ "hashbrown 0.14.0", "keyed-set", @@ -4056,7 +4056,7 @@ dependencies = [ [[package]] name = "zenoh-link" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" dependencies = [ "async-trait", "zenoh-config", @@ -4074,7 +4074,7 @@ dependencies = [ [[package]] name = "zenoh-link-commons" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" dependencies = [ "async-trait", "flume", @@ -4098,7 +4098,7 @@ dependencies = [ [[package]] name = "zenoh-link-quic" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" dependencies = [ "async-trait", "base64 0.21.4", @@ -4128,7 +4128,7 @@ dependencies = [ [[package]] name = "zenoh-link-tcp" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" dependencies = [ "async-trait", "tokio", @@ -4146,7 +4146,7 @@ dependencies = [ [[package]] name = "zenoh-link-tls" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" dependencies = [ "async-trait", "base64 0.21.4", @@ -4174,7 +4174,7 @@ dependencies = [ [[package]] name = "zenoh-link-udp" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" dependencies = [ "async-trait", "socket2 0.5.6", @@ -4195,7 +4195,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixsock_stream" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" dependencies = [ "async-trait", "futures", @@ -4215,7 +4215,7 @@ dependencies = [ [[package]] name = "zenoh-link-ws" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" dependencies = [ "async-trait", "futures-util", @@ -4236,7 +4236,7 @@ dependencies = [ [[package]] name = "zenoh-macros" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" dependencies = [ "proc-macro2", "quote", @@ -4247,7 +4247,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-trait" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" dependencies = [ "const_format", "libloading", @@ -4263,7 +4263,7 @@ dependencies = [ [[package]] name = "zenoh-protocol" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" dependencies = [ "const_format", "rand 0.8.5", @@ -4277,7 +4277,7 @@ dependencies = [ [[package]] name = "zenoh-result" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" dependencies = [ "anyhow", ] @@ -4285,7 +4285,7 @@ dependencies = [ [[package]] name = "zenoh-runtime" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" dependencies = [ "futures", "lazy_static", @@ -4301,7 +4301,7 @@ dependencies = [ [[package]] name = "zenoh-sync" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" dependencies = [ "event-listener 4.0.0", "futures", @@ -4315,7 +4315,7 @@ dependencies = [ [[package]] name = "zenoh-task" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" dependencies = [ "futures", "tokio", @@ -4328,7 +4328,7 @@ dependencies = [ [[package]] name = "zenoh-transport" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" dependencies = [ "async-trait", "flume", @@ -4360,7 +4360,7 @@ dependencies = [ [[package]] name = "zenoh-util" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" dependencies = [ "async-std", "async-trait", @@ -4383,7 +4383,7 @@ dependencies = [ [[package]] name = "zenoh_backend_traits" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3118d31b8c83343ac4dc990ae1bbdc59aa62f103" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" dependencies = [ "async-std", "async-trait", From ca5409e87a732ccae823107e043df1046ab1d852 Mon Sep 17 00:00:00 2001 From: eclipse-zenoh-bot <61247838+eclipse-zenoh-bot@users.noreply.github.com> Date: Tue, 4 Jun 2024 02:14:54 +0200 Subject: [PATCH 04/16] build: Sync with eclipse-zenoh/zenoh@d574654 from 2024-06-03 (#123) Co-authored-by: eclipse-zenoh-bot --- Cargo.lock | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8ac4eb6..0081660 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3869,7 +3869,7 @@ dependencies = [ [[package]] name = "zenoh" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" dependencies = [ "ahash", "async-trait", @@ -3972,7 +3972,7 @@ dependencies = [ [[package]] name = "zenoh-buffers" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" dependencies = [ "zenoh-collections", ] @@ -3980,7 +3980,7 @@ dependencies = [ [[package]] name = "zenoh-codec" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" dependencies = [ "serde", "tracing", @@ -3992,12 +3992,12 @@ dependencies = [ [[package]] name = "zenoh-collections" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" [[package]] name = "zenoh-config" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" dependencies = [ "flume", "json5", @@ -4017,7 +4017,7 @@ dependencies = [ [[package]] name = "zenoh-core" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" dependencies = [ "async-global-executor", "lazy_static", @@ -4029,7 +4029,7 @@ dependencies = [ [[package]] name = "zenoh-crypto" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" dependencies = [ "aes 0.8.3", "hmac 0.12.1", @@ -4042,7 +4042,7 @@ dependencies = [ [[package]] name = "zenoh-keyexpr" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" dependencies = [ "hashbrown 0.14.0", "keyed-set", @@ -4056,7 +4056,7 @@ dependencies = [ [[package]] name = "zenoh-link" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" dependencies = [ "async-trait", "zenoh-config", @@ -4074,7 +4074,7 @@ dependencies = [ [[package]] name = "zenoh-link-commons" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" dependencies = [ "async-trait", "flume", @@ -4098,7 +4098,7 @@ dependencies = [ [[package]] name = "zenoh-link-quic" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" dependencies = [ "async-trait", "base64 0.21.4", @@ -4128,7 +4128,7 @@ dependencies = [ [[package]] name = "zenoh-link-tcp" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" dependencies = [ "async-trait", "tokio", @@ -4146,7 +4146,7 @@ dependencies = [ [[package]] name = "zenoh-link-tls" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" dependencies = [ "async-trait", "base64 0.21.4", @@ -4174,7 +4174,7 @@ dependencies = [ [[package]] name = "zenoh-link-udp" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" dependencies = [ "async-trait", "socket2 0.5.6", @@ -4195,7 +4195,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixsock_stream" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" dependencies = [ "async-trait", "futures", @@ -4215,7 +4215,7 @@ dependencies = [ [[package]] name = "zenoh-link-ws" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" dependencies = [ "async-trait", "futures-util", @@ -4236,7 +4236,7 @@ dependencies = [ [[package]] name = "zenoh-macros" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" dependencies = [ "proc-macro2", "quote", @@ -4247,7 +4247,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-trait" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" dependencies = [ "const_format", "libloading", @@ -4263,7 +4263,7 @@ dependencies = [ [[package]] name = "zenoh-protocol" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" dependencies = [ "const_format", "rand 0.8.5", @@ -4277,7 +4277,7 @@ dependencies = [ [[package]] name = "zenoh-result" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" dependencies = [ "anyhow", ] @@ -4285,7 +4285,7 @@ dependencies = [ [[package]] name = "zenoh-runtime" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" dependencies = [ "futures", "lazy_static", @@ -4301,7 +4301,7 @@ dependencies = [ [[package]] name = "zenoh-sync" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" dependencies = [ "event-listener 4.0.0", "futures", @@ -4315,7 +4315,7 @@ dependencies = [ [[package]] name = "zenoh-task" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" dependencies = [ "futures", "tokio", @@ -4328,7 +4328,7 @@ dependencies = [ [[package]] name = "zenoh-transport" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" dependencies = [ "async-trait", "flume", @@ -4360,7 +4360,7 @@ dependencies = [ [[package]] name = "zenoh-util" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" dependencies = [ "async-std", "async-trait", @@ -4383,7 +4383,7 @@ dependencies = [ [[package]] name = "zenoh_backend_traits" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#009f66612fe01953d8f75e9d92f1e8c79ffd2a74" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" dependencies = [ "async-std", "async-trait", From 063b5797c531568f2c28b39db24c5c8c23c9f92a Mon Sep 17 00:00:00 2001 From: eclipse-zenoh-bot <61247838+eclipse-zenoh-bot@users.noreply.github.com> Date: Thu, 6 Jun 2024 02:16:00 +0200 Subject: [PATCH 05/16] build: Sync with eclipse-zenoh/zenoh@c279982 from 2024-06-05 (#124) Co-authored-by: eclipse-zenoh-bot --- Cargo.lock | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0081660..ff3a547 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3869,7 +3869,7 @@ dependencies = [ [[package]] name = "zenoh" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" dependencies = [ "ahash", "async-trait", @@ -3972,7 +3972,7 @@ dependencies = [ [[package]] name = "zenoh-buffers" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" dependencies = [ "zenoh-collections", ] @@ -3980,7 +3980,7 @@ dependencies = [ [[package]] name = "zenoh-codec" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" dependencies = [ "serde", "tracing", @@ -3992,12 +3992,12 @@ dependencies = [ [[package]] name = "zenoh-collections" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" [[package]] name = "zenoh-config" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" dependencies = [ "flume", "json5", @@ -4017,7 +4017,7 @@ dependencies = [ [[package]] name = "zenoh-core" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" dependencies = [ "async-global-executor", "lazy_static", @@ -4029,7 +4029,7 @@ dependencies = [ [[package]] name = "zenoh-crypto" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" dependencies = [ "aes 0.8.3", "hmac 0.12.1", @@ -4042,7 +4042,7 @@ dependencies = [ [[package]] name = "zenoh-keyexpr" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" dependencies = [ "hashbrown 0.14.0", "keyed-set", @@ -4056,7 +4056,7 @@ dependencies = [ [[package]] name = "zenoh-link" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" dependencies = [ "async-trait", "zenoh-config", @@ -4074,7 +4074,7 @@ dependencies = [ [[package]] name = "zenoh-link-commons" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" dependencies = [ "async-trait", "flume", @@ -4098,7 +4098,7 @@ dependencies = [ [[package]] name = "zenoh-link-quic" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" dependencies = [ "async-trait", "base64 0.21.4", @@ -4128,7 +4128,7 @@ dependencies = [ [[package]] name = "zenoh-link-tcp" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" dependencies = [ "async-trait", "tokio", @@ -4146,7 +4146,7 @@ dependencies = [ [[package]] name = "zenoh-link-tls" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" dependencies = [ "async-trait", "base64 0.21.4", @@ -4174,7 +4174,7 @@ dependencies = [ [[package]] name = "zenoh-link-udp" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" dependencies = [ "async-trait", "socket2 0.5.6", @@ -4195,7 +4195,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixsock_stream" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" dependencies = [ "async-trait", "futures", @@ -4215,7 +4215,7 @@ dependencies = [ [[package]] name = "zenoh-link-ws" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" dependencies = [ "async-trait", "futures-util", @@ -4236,7 +4236,7 @@ dependencies = [ [[package]] name = "zenoh-macros" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" dependencies = [ "proc-macro2", "quote", @@ -4247,7 +4247,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-trait" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" dependencies = [ "const_format", "libloading", @@ -4263,7 +4263,7 @@ dependencies = [ [[package]] name = "zenoh-protocol" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" dependencies = [ "const_format", "rand 0.8.5", @@ -4277,7 +4277,7 @@ dependencies = [ [[package]] name = "zenoh-result" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" dependencies = [ "anyhow", ] @@ -4285,7 +4285,7 @@ dependencies = [ [[package]] name = "zenoh-runtime" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" dependencies = [ "futures", "lazy_static", @@ -4301,7 +4301,7 @@ dependencies = [ [[package]] name = "zenoh-sync" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" dependencies = [ "event-listener 4.0.0", "futures", @@ -4315,7 +4315,7 @@ dependencies = [ [[package]] name = "zenoh-task" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" dependencies = [ "futures", "tokio", @@ -4328,7 +4328,7 @@ dependencies = [ [[package]] name = "zenoh-transport" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" dependencies = [ "async-trait", "flume", @@ -4360,7 +4360,7 @@ dependencies = [ [[package]] name = "zenoh-util" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" dependencies = [ "async-std", "async-trait", @@ -4383,7 +4383,7 @@ dependencies = [ [[package]] name = "zenoh_backend_traits" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d574654c618bf62f7baf9754f7c258d1b46f6465" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" dependencies = [ "async-std", "async-trait", From fdf5720bcde5f1a928d23a2e7dc0ca6cf62ac00b Mon Sep 17 00:00:00 2001 From: eclipse-zenoh-bot <61247838+eclipse-zenoh-bot@users.noreply.github.com> Date: Tue, 11 Jun 2024 02:15:49 +0200 Subject: [PATCH 06/16] build: Sync with eclipse-zenoh/zenoh@d8e66de from 2024-06-10 (#125) Co-authored-by: eclipse-zenoh-bot --- Cargo.lock | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ff3a547..c77a5d9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3869,7 +3869,7 @@ dependencies = [ [[package]] name = "zenoh" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" dependencies = [ "ahash", "async-trait", @@ -3972,7 +3972,7 @@ dependencies = [ [[package]] name = "zenoh-buffers" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" dependencies = [ "zenoh-collections", ] @@ -3980,7 +3980,7 @@ dependencies = [ [[package]] name = "zenoh-codec" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" dependencies = [ "serde", "tracing", @@ -3992,12 +3992,12 @@ dependencies = [ [[package]] name = "zenoh-collections" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" [[package]] name = "zenoh-config" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" dependencies = [ "flume", "json5", @@ -4017,7 +4017,7 @@ dependencies = [ [[package]] name = "zenoh-core" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" dependencies = [ "async-global-executor", "lazy_static", @@ -4029,7 +4029,7 @@ dependencies = [ [[package]] name = "zenoh-crypto" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" dependencies = [ "aes 0.8.3", "hmac 0.12.1", @@ -4042,7 +4042,7 @@ dependencies = [ [[package]] name = "zenoh-keyexpr" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" dependencies = [ "hashbrown 0.14.0", "keyed-set", @@ -4056,7 +4056,7 @@ dependencies = [ [[package]] name = "zenoh-link" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" dependencies = [ "async-trait", "zenoh-config", @@ -4074,7 +4074,7 @@ dependencies = [ [[package]] name = "zenoh-link-commons" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" dependencies = [ "async-trait", "flume", @@ -4098,7 +4098,7 @@ dependencies = [ [[package]] name = "zenoh-link-quic" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" dependencies = [ "async-trait", "base64 0.21.4", @@ -4128,7 +4128,7 @@ dependencies = [ [[package]] name = "zenoh-link-tcp" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" dependencies = [ "async-trait", "tokio", @@ -4146,7 +4146,7 @@ dependencies = [ [[package]] name = "zenoh-link-tls" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" dependencies = [ "async-trait", "base64 0.21.4", @@ -4174,7 +4174,7 @@ dependencies = [ [[package]] name = "zenoh-link-udp" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" dependencies = [ "async-trait", "socket2 0.5.6", @@ -4195,7 +4195,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixsock_stream" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" dependencies = [ "async-trait", "futures", @@ -4215,7 +4215,7 @@ dependencies = [ [[package]] name = "zenoh-link-ws" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" dependencies = [ "async-trait", "futures-util", @@ -4236,7 +4236,7 @@ dependencies = [ [[package]] name = "zenoh-macros" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" dependencies = [ "proc-macro2", "quote", @@ -4247,7 +4247,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-trait" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" dependencies = [ "const_format", "libloading", @@ -4263,7 +4263,7 @@ dependencies = [ [[package]] name = "zenoh-protocol" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" dependencies = [ "const_format", "rand 0.8.5", @@ -4277,7 +4277,7 @@ dependencies = [ [[package]] name = "zenoh-result" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" dependencies = [ "anyhow", ] @@ -4285,7 +4285,7 @@ dependencies = [ [[package]] name = "zenoh-runtime" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" dependencies = [ "futures", "lazy_static", @@ -4301,7 +4301,7 @@ dependencies = [ [[package]] name = "zenoh-sync" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" dependencies = [ "event-listener 4.0.0", "futures", @@ -4315,7 +4315,7 @@ dependencies = [ [[package]] name = "zenoh-task" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" dependencies = [ "futures", "tokio", @@ -4328,7 +4328,7 @@ dependencies = [ [[package]] name = "zenoh-transport" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" dependencies = [ "async-trait", "flume", @@ -4360,7 +4360,7 @@ dependencies = [ [[package]] name = "zenoh-util" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" dependencies = [ "async-std", "async-trait", @@ -4383,7 +4383,7 @@ dependencies = [ [[package]] name = "zenoh_backend_traits" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c279982c131c556ebd474f4ffa9fd6c096d13830" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" dependencies = [ "async-std", "async-trait", From 9d8a35311bcebd1f0ba02e04bae3dfc770c3fa17 Mon Sep 17 00:00:00 2001 From: eclipse-zenoh-bot <61247838+eclipse-zenoh-bot@users.noreply.github.com> Date: Wed, 12 Jun 2024 02:15:33 +0200 Subject: [PATCH 07/16] build: Sync with eclipse-zenoh/zenoh@9d09742 from 2024-06-11 (#126) Co-authored-by: eclipse-zenoh-bot --- Cargo.lock | 293 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 192 insertions(+), 101 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c77a5d9..07b6912 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -379,9 +379,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" dependencies = [ "serde", ] @@ -452,6 +452,12 @@ dependencies = [ "libc", ] +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + [[package]] name = "cfg-if" version = "1.0.0" @@ -492,6 +498,16 @@ dependencies = [ "inout", ] +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + [[package]] name = "concurrent-queue" version = "2.2.0" @@ -569,9 +585,9 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -579,9 +595,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" @@ -1281,7 +1297,7 @@ dependencies = [ "futures-util", "http 0.2.12", "hyper", - "rustls 0.21.7", + "rustls 0.21.12", "tokio", "tokio-rustls 0.24.1", ] @@ -1472,6 +1488,26 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +[[package]] +name = "jni" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + [[package]] name = "js-sys" version = "0.3.64" @@ -1663,7 +1699,7 @@ version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cfg-if", "libc", ] @@ -1695,6 +1731,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "num-bigint" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + [[package]] name = "num-bigint-dig" version = "0.8.4" @@ -1764,9 +1811,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "opaque-debug" @@ -2065,16 +2112,16 @@ dependencies = [ [[package]] name = "quinn" -version = "0.10.2" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75" +checksum = "904e3d3ba178131798c6d9375db2b13b34337d489b089fc5ba0825a2ff1bee73" dependencies = [ "bytes", "pin-project-lite", "quinn-proto", "quinn-udp", "rustc-hash", - "rustls 0.21.7", + "rustls 0.23.9", "thiserror", "tokio", "tracing", @@ -2082,16 +2129,16 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.10.4" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13f81c9a9d574310b8351f8666f5a93ac3b0069c45c28ad52c10291389a7cf9" +checksum = "e974563a4b1c2206bbc61191ca4da9c22e4308b4c455e8906751cc7828393f08" dependencies = [ "bytes", "rand 0.8.5", - "ring 0.16.20", + "ring 0.17.6", "rustc-hash", - "rustls 0.21.7", - "rustls-native-certs 0.6.3", + "rustls 0.23.9", + "rustls-platform-verifier", "slab", "thiserror", "tinyvec", @@ -2100,15 +2147,15 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7" +checksum = "e4f0def2590301f4f667db5a77f9694fb004f82796dc1a8b1508fafa3d0e8b72" dependencies = [ - "bytes", "libc", + "once_cell", "socket2 0.5.6", "tracing", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2287,7 +2334,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.7", + "rustls 0.21.12", "rustls-pemfile 1.0.3", "serde", "serde_json", @@ -2353,7 +2400,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ "base64 0.21.4", - "bitflags 2.4.2", + "bitflags 2.5.0", "serde", "serde_derive", ] @@ -2439,42 +2486,31 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.7" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", - "ring 0.16.20", - "rustls-webpki 0.101.5", - "sct 0.7.0", + "ring 0.17.6", + "rustls-webpki 0.101.7", + "sct 0.7.1", ] [[package]] name = "rustls" -version = "0.22.4" +version = "0.23.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +checksum = "a218f0f6d05669de4eabfb24f31ce802035c952429d037507b4a4a39f0e60c5b" dependencies = [ "log", + "once_cell", "ring 0.17.6", "rustls-pki-types", - "rustls-webpki 0.102.2", + "rustls-webpki 0.102.4", "subtle", "zeroize", ] -[[package]] -name = "rustls-native-certs" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" -dependencies = [ - "openssl-probe", - "rustls-pemfile 1.0.3", - "schannel", - "security-framework", -] - [[package]] name = "rustls-native-certs" version = "0.7.0" @@ -2509,25 +2545,52 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.3.1" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" + +[[package]] +name = "rustls-platform-verifier" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5f0d26fa1ce3c790f9590868f0109289a044acb954525f933e2aa3b871c157d" +dependencies = [ + "core-foundation", + "core-foundation-sys", + "jni", + "log", + "once_cell", + "rustls 0.23.9", + "rustls-native-certs", + "rustls-platform-verifier-android", + "rustls-webpki 0.102.4", + "security-framework", + "security-framework-sys", + "webpki-roots 0.26.0", + "winapi", +] + +[[package]] +name = "rustls-platform-verifier-android" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ede67b28608b4c60685c7d54122d4400d90f62b40caee7700e700380a390fa8" +checksum = "84e217e7fdc8466b5b35d30f8c0a30febd29173df4a3a0c2115d306b9c4117ad" [[package]] name = "rustls-webpki" -version = "0.101.5" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a27e3b59326c16e23d30aeb7a36a24cc0d29e71d68ff611cdfb4a01d013bed" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "ring 0.17.6", + "untrusted 0.9.0", ] [[package]] name = "rustls-webpki" -version = "0.102.2" +version = "0.102.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" dependencies = [ "ring 0.17.6", "rustls-pki-types", @@ -2540,6 +2603,15 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + [[package]] name = "schannel" version = "0.1.22" @@ -2591,12 +2663,12 @@ dependencies = [ [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "ring 0.17.6", + "untrusted 0.9.0", ] [[package]] @@ -2611,22 +2683,23 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.2" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "core-foundation", "core-foundation-sys", "libc", + "num-bigint", "security-framework-sys", ] [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" dependencies = [ "core-foundation-sys", "libc", @@ -3207,17 +3280,17 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.7", + "rustls 0.21.12", "tokio", ] [[package]] name = "tokio-rustls" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.22.4", + "rustls 0.23.9", "rustls-pki-types", "tokio", ] @@ -3549,6 +3622,16 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" +[[package]] +name = "walkdir" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +dependencies = [ + "same-file", + "winapi-util", +] + [[package]] name = "want" version = "0.3.1" @@ -3709,6 +3792,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" @@ -3869,7 +3961,7 @@ dependencies = [ [[package]] name = "zenoh" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" dependencies = [ "ahash", "async-trait", @@ -3972,7 +4064,7 @@ dependencies = [ [[package]] name = "zenoh-buffers" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" dependencies = [ "zenoh-collections", ] @@ -3980,7 +4072,7 @@ dependencies = [ [[package]] name = "zenoh-codec" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" dependencies = [ "serde", "tracing", @@ -3992,12 +4084,12 @@ dependencies = [ [[package]] name = "zenoh-collections" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" [[package]] name = "zenoh-config" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" dependencies = [ "flume", "json5", @@ -4017,7 +4109,7 @@ dependencies = [ [[package]] name = "zenoh-core" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" dependencies = [ "async-global-executor", "lazy_static", @@ -4029,7 +4121,7 @@ dependencies = [ [[package]] name = "zenoh-crypto" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" dependencies = [ "aes 0.8.3", "hmac 0.12.1", @@ -4042,7 +4134,7 @@ dependencies = [ [[package]] name = "zenoh-keyexpr" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" dependencies = [ "hashbrown 0.14.0", "keyed-set", @@ -4056,7 +4148,7 @@ dependencies = [ [[package]] name = "zenoh-link" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" dependencies = [ "async-trait", "zenoh-config", @@ -4074,13 +4166,13 @@ dependencies = [ [[package]] name = "zenoh-link-commons" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" dependencies = [ "async-trait", "flume", "futures", - "rustls 0.22.4", - "rustls-webpki 0.102.2", + "rustls 0.23.9", + "rustls-webpki 0.102.4", "serde", "tokio", "tokio-util", @@ -4098,20 +4190,19 @@ dependencies = [ [[package]] name = "zenoh-link-quic" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" dependencies = [ "async-trait", "base64 0.21.4", "futures", "quinn", - "rustls 0.21.7", - "rustls-native-certs 0.7.0", - "rustls-pemfile 1.0.3", + "rustls 0.23.9", + "rustls-pemfile 2.0.0", "rustls-pki-types", - "rustls-webpki 0.102.2", + "rustls-webpki 0.102.4", "secrecy", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls 0.26.0", "tokio-util", "tracing", "webpki-roots 0.26.0", @@ -4128,7 +4219,7 @@ dependencies = [ [[package]] name = "zenoh-link-tcp" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" dependencies = [ "async-trait", "tokio", @@ -4146,18 +4237,18 @@ dependencies = [ [[package]] name = "zenoh-link-tls" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" dependencies = [ "async-trait", "base64 0.21.4", "futures", - "rustls 0.22.4", + "rustls 0.23.9", "rustls-pemfile 2.0.0", "rustls-pki-types", - "rustls-webpki 0.102.2", + "rustls-webpki 0.102.4", "secrecy", "tokio", - "tokio-rustls 0.25.0", + "tokio-rustls 0.26.0", "tokio-util", "tracing", "webpki-roots 0.26.0", @@ -4174,7 +4265,7 @@ dependencies = [ [[package]] name = "zenoh-link-udp" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" dependencies = [ "async-trait", "socket2 0.5.6", @@ -4195,7 +4286,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixsock_stream" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" dependencies = [ "async-trait", "futures", @@ -4215,7 +4306,7 @@ dependencies = [ [[package]] name = "zenoh-link-ws" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" dependencies = [ "async-trait", "futures-util", @@ -4236,7 +4327,7 @@ dependencies = [ [[package]] name = "zenoh-macros" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" dependencies = [ "proc-macro2", "quote", @@ -4247,7 +4338,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-trait" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" dependencies = [ "const_format", "libloading", @@ -4263,7 +4354,7 @@ dependencies = [ [[package]] name = "zenoh-protocol" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" dependencies = [ "const_format", "rand 0.8.5", @@ -4277,7 +4368,7 @@ dependencies = [ [[package]] name = "zenoh-result" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" dependencies = [ "anyhow", ] @@ -4285,7 +4376,7 @@ dependencies = [ [[package]] name = "zenoh-runtime" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" dependencies = [ "futures", "lazy_static", @@ -4301,7 +4392,7 @@ dependencies = [ [[package]] name = "zenoh-sync" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" dependencies = [ "event-listener 4.0.0", "futures", @@ -4315,7 +4406,7 @@ dependencies = [ [[package]] name = "zenoh-task" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" dependencies = [ "futures", "tokio", @@ -4328,7 +4419,7 @@ dependencies = [ [[package]] name = "zenoh-transport" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" dependencies = [ "async-trait", "flume", @@ -4360,7 +4451,7 @@ dependencies = [ [[package]] name = "zenoh-util" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" dependencies = [ "async-std", "async-trait", @@ -4383,7 +4474,7 @@ dependencies = [ [[package]] name = "zenoh_backend_traits" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d8e66decbe8bd7a1981579fd49ea333c0acd41ff" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" dependencies = [ "async-std", "async-trait", From bedc328ffb894abfaf1ebc9724869249ec7c2d0f Mon Sep 17 00:00:00 2001 From: eclipse-zenoh-bot <61247838+eclipse-zenoh-bot@users.noreply.github.com> Date: Thu, 13 Jun 2024 02:16:16 +0200 Subject: [PATCH 08/16] build: Sync with eclipse-zenoh/zenoh@ed6c636 from 2024-06-12 (#127) Co-authored-by: eclipse-zenoh-bot --- Cargo.lock | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 07b6912..62956b8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3961,7 +3961,7 @@ dependencies = [ [[package]] name = "zenoh" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" dependencies = [ "ahash", "async-trait", @@ -4064,7 +4064,7 @@ dependencies = [ [[package]] name = "zenoh-buffers" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" dependencies = [ "zenoh-collections", ] @@ -4072,7 +4072,7 @@ dependencies = [ [[package]] name = "zenoh-codec" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" dependencies = [ "serde", "tracing", @@ -4084,12 +4084,12 @@ dependencies = [ [[package]] name = "zenoh-collections" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" [[package]] name = "zenoh-config" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" dependencies = [ "flume", "json5", @@ -4109,7 +4109,7 @@ dependencies = [ [[package]] name = "zenoh-core" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" dependencies = [ "async-global-executor", "lazy_static", @@ -4121,7 +4121,7 @@ dependencies = [ [[package]] name = "zenoh-crypto" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" dependencies = [ "aes 0.8.3", "hmac 0.12.1", @@ -4134,7 +4134,7 @@ dependencies = [ [[package]] name = "zenoh-keyexpr" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" dependencies = [ "hashbrown 0.14.0", "keyed-set", @@ -4148,7 +4148,7 @@ dependencies = [ [[package]] name = "zenoh-link" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" dependencies = [ "async-trait", "zenoh-config", @@ -4166,7 +4166,7 @@ dependencies = [ [[package]] name = "zenoh-link-commons" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" dependencies = [ "async-trait", "flume", @@ -4190,7 +4190,7 @@ dependencies = [ [[package]] name = "zenoh-link-quic" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" dependencies = [ "async-trait", "base64 0.21.4", @@ -4219,7 +4219,7 @@ dependencies = [ [[package]] name = "zenoh-link-tcp" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" dependencies = [ "async-trait", "tokio", @@ -4237,7 +4237,7 @@ dependencies = [ [[package]] name = "zenoh-link-tls" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" dependencies = [ "async-trait", "base64 0.21.4", @@ -4265,7 +4265,7 @@ dependencies = [ [[package]] name = "zenoh-link-udp" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" dependencies = [ "async-trait", "socket2 0.5.6", @@ -4286,7 +4286,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixsock_stream" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" dependencies = [ "async-trait", "futures", @@ -4306,7 +4306,7 @@ dependencies = [ [[package]] name = "zenoh-link-ws" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" dependencies = [ "async-trait", "futures-util", @@ -4327,7 +4327,7 @@ dependencies = [ [[package]] name = "zenoh-macros" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" dependencies = [ "proc-macro2", "quote", @@ -4338,7 +4338,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-trait" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" dependencies = [ "const_format", "libloading", @@ -4354,7 +4354,7 @@ dependencies = [ [[package]] name = "zenoh-protocol" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" dependencies = [ "const_format", "rand 0.8.5", @@ -4368,7 +4368,7 @@ dependencies = [ [[package]] name = "zenoh-result" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" dependencies = [ "anyhow", ] @@ -4376,7 +4376,7 @@ dependencies = [ [[package]] name = "zenoh-runtime" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" dependencies = [ "futures", "lazy_static", @@ -4392,7 +4392,7 @@ dependencies = [ [[package]] name = "zenoh-sync" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" dependencies = [ "event-listener 4.0.0", "futures", @@ -4406,7 +4406,7 @@ dependencies = [ [[package]] name = "zenoh-task" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" dependencies = [ "futures", "tokio", @@ -4419,7 +4419,7 @@ dependencies = [ [[package]] name = "zenoh-transport" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" dependencies = [ "async-trait", "flume", @@ -4451,7 +4451,7 @@ dependencies = [ [[package]] name = "zenoh-util" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" dependencies = [ "async-std", "async-trait", @@ -4474,7 +4474,7 @@ dependencies = [ [[package]] name = "zenoh_backend_traits" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#9d0974289ade917ffe56079479e1ddd598eda494" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" dependencies = [ "async-std", "async-trait", From a4b4d24435565c9afac2b78d9cdd5cbcbf2bd9f7 Mon Sep 17 00:00:00 2001 From: Charles Schleich Date: Thu, 13 Jun 2024 18:26:46 +0200 Subject: [PATCH 09/16] Update v1 to use zenoh v1.0.0 --- Cargo.lock | 356 ++++++++++++++++++++++++++------------------------ Cargo.toml | 20 ++- v1/Cargo.toml | 11 +- v1/src/lib.rs | 62 ++++----- 4 files changed, 241 insertions(+), 208 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 62956b8..d266503 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -311,7 +311,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.66", ] [[package]] @@ -452,12 +452,6 @@ dependencies = [ "libc", ] -[[package]] -name = "cesu8" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" - [[package]] name = "cfg-if" version = "1.0.0" @@ -498,16 +492,6 @@ dependencies = [ "inout", ] -[[package]] -name = "combine" -version = "4.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" -dependencies = [ - "bytes", - "memchr", -] - [[package]] name = "concurrent-queue" version = "2.2.0" @@ -967,7 +951,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.66", ] [[package]] @@ -1109,6 +1093,12 @@ dependencies = [ "tracing", ] +[[package]] +name = "half" +version = "1.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" + [[package]] name = "hashbrown" version = "0.13.2" @@ -1426,7 +1416,7 @@ checksum = "6ac96b3660efd0cde32b0b20bc86cc93f33269cd9f6c97e759e0b0259b2133fb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.66", ] [[package]] @@ -1473,6 +1463,12 @@ dependencies = [ "serde", ] +[[package]] +name = "iter-read" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c397ca3ea05ad509c4ec451fea28b4771236a376ca1c69fd5143aae0cf8f93c4" + [[package]] name = "itertools" version = "0.10.5" @@ -1488,26 +1484,6 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" -[[package]] -name = "jni" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" -dependencies = [ - "cesu8", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", -] - -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - [[package]] name = "js-sys" version = "0.3.64" @@ -1953,7 +1929,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.66", ] [[package]] @@ -1977,6 +1953,48 @@ dependencies = [ "indexmap", ] +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand 0.8.5", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + [[package]] name = "pin-project" version = "1.1.3" @@ -1994,7 +2012,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.66", ] [[package]] @@ -2103,25 +2121,25 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] [[package]] name = "quinn" -version = "0.11.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904e3d3ba178131798c6d9375db2b13b34337d489b089fc5ba0825a2ff1bee73" +checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75" dependencies = [ "bytes", "pin-project-lite", "quinn-proto", "quinn-udp", "rustc-hash", - "rustls 0.23.9", + "rustls 0.21.12", "thiserror", "tokio", "tracing", @@ -2129,16 +2147,16 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.2" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e974563a4b1c2206bbc61191ca4da9c22e4308b4c455e8906751cc7828393f08" +checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a" dependencies = [ "bytes", "rand 0.8.5", - "ring 0.17.6", + "ring 0.16.20", "rustc-hash", - "rustls 0.23.9", - "rustls-platform-verifier", + "rustls 0.21.12", + "rustls-native-certs 0.6.3", "slab", "thiserror", "tinyvec", @@ -2147,22 +2165,22 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.1" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4f0def2590301f4f667db5a77f9694fb004f82796dc1a8b1508fafa3d0e8b72" +checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7" dependencies = [ + "bytes", "libc", - "once_cell", "socket2 0.5.6", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.48.0", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -2498,12 +2516,11 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.9" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a218f0f6d05669de4eabfb24f31ce802035c952429d037507b4a4a39f0e60c5b" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" dependencies = [ "log", - "once_cell", "ring 0.17.6", "rustls-pki-types", "rustls-webpki 0.102.4", @@ -2511,6 +2528,18 @@ dependencies = [ "zeroize", ] +[[package]] +name = "rustls-native-certs" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +dependencies = [ + "openssl-probe", + "rustls-pemfile 1.0.3", + "schannel", + "security-framework", +] + [[package]] name = "rustls-native-certs" version = "0.7.0" @@ -2549,33 +2578,6 @@ version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" -[[package]] -name = "rustls-platform-verifier" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5f0d26fa1ce3c790f9590868f0109289a044acb954525f933e2aa3b871c157d" -dependencies = [ - "core-foundation", - "core-foundation-sys", - "jni", - "log", - "once_cell", - "rustls 0.23.9", - "rustls-native-certs", - "rustls-platform-verifier-android", - "rustls-webpki 0.102.4", - "security-framework", - "security-framework-sys", - "webpki-roots 0.26.0", - "winapi", -] - -[[package]] -name = "rustls-platform-verifier-android" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84e217e7fdc8466b5b35d30f8c0a30febd29173df4a3a0c2115d306b9c4117ad" - [[package]] name = "rustls-webpki" version = "0.101.7" @@ -2603,15 +2605,6 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - [[package]] name = "schannel" version = "0.1.22" @@ -2691,7 +2684,6 @@ dependencies = [ "core-foundation", "core-foundation-sys", "libc", - "num-bigint", "security-framework-sys", ] @@ -2728,22 +2720,45 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] +[[package]] +name = "serde-pickle" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c762ad136a26407c6a80825813600ceeab5e613660d93d79a41f0ec877171e71" +dependencies = [ + "byteorder", + "iter-read", + "num-bigint", + "num-traits", + "serde", +] + +[[package]] +name = "serde_cbor" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" +dependencies = [ + "half", + "serde", +] + [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.66", ] [[package]] @@ -2759,9 +2774,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "itoa", "ryu", @@ -2920,6 +2935,12 @@ dependencies = [ "event-listener 2.5.3", ] +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + [[package]] name = "slab" version = "0.4.9" @@ -3118,9 +3139,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.33" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9caece70c63bfba29ec2fed841a09851b14a235c60010fa4de58089b6c025668" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -3171,7 +3192,7 @@ checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.66", ] [[package]] @@ -3271,7 +3292,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.66", ] [[package]] @@ -3286,11 +3307,11 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.26.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ - "rustls 0.23.9", + "rustls 0.22.4", "rustls-pki-types", "tokio", ] @@ -3350,7 +3371,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.66", ] [[package]] @@ -3530,6 +3551,12 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" +[[package]] +name = "unwrap-infallible" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb" + [[package]] name = "unzip-n" version = "0.1.2" @@ -3622,16 +3649,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" -[[package]] -name = "walkdir" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" -dependencies = [ - "same-file", - "winapi-util", -] - [[package]] name = "want" version = "0.3.1" @@ -3674,7 +3691,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.66", "wasm-bindgen-shared", ] @@ -3708,7 +3725,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3792,15 +3809,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" @@ -3961,7 +3969,7 @@ dependencies = [ [[package]] name = "zenoh" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" dependencies = [ "ahash", "async-trait", @@ -3976,17 +3984,22 @@ dependencies = [ "ordered-float 4.1.1", "paste", "petgraph", + "phf", "rand 0.8.5", "regex", "rustc_version 0.4.0", "serde", + "serde-pickle", + "serde_cbor", "serde_json", + "serde_yaml", "socket2 0.5.6", "stop-token", "tokio", "tokio-util", "tracing", "uhlc", + "unwrap-infallible", "uuid", "vec_map", "zenoh-buffers", @@ -4025,9 +4038,12 @@ dependencies = [ "tracing", "uuid", "zenoh", + "zenoh-buffers", "zenoh-collections", "zenoh-core", + "zenoh-keyexpr", "zenoh-plugin-trait", + "zenoh-protocol", "zenoh-util", "zenoh_backend_traits", ] @@ -4064,7 +4080,7 @@ dependencies = [ [[package]] name = "zenoh-buffers" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" dependencies = [ "zenoh-collections", ] @@ -4072,7 +4088,7 @@ dependencies = [ [[package]] name = "zenoh-codec" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" dependencies = [ "serde", "tracing", @@ -4084,12 +4100,12 @@ dependencies = [ [[package]] name = "zenoh-collections" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" [[package]] name = "zenoh-config" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" dependencies = [ "flume", "json5", @@ -4099,6 +4115,7 @@ dependencies = [ "serde_json", "serde_yaml", "tracing", + "uhlc", "validated_struct", "zenoh-core", "zenoh-protocol", @@ -4109,7 +4126,7 @@ dependencies = [ [[package]] name = "zenoh-core" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" dependencies = [ "async-global-executor", "lazy_static", @@ -4121,7 +4138,7 @@ dependencies = [ [[package]] name = "zenoh-crypto" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" dependencies = [ "aes 0.8.3", "hmac 0.12.1", @@ -4134,7 +4151,7 @@ dependencies = [ [[package]] name = "zenoh-keyexpr" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" dependencies = [ "hashbrown 0.14.0", "keyed-set", @@ -4148,7 +4165,7 @@ dependencies = [ [[package]] name = "zenoh-link" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" dependencies = [ "async-trait", "zenoh-config", @@ -4166,12 +4183,12 @@ dependencies = [ [[package]] name = "zenoh-link-commons" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" dependencies = [ "async-trait", "flume", "futures", - "rustls 0.23.9", + "rustls 0.22.4", "rustls-webpki 0.102.4", "serde", "tokio", @@ -4190,22 +4207,24 @@ dependencies = [ [[package]] name = "zenoh-link-quic" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" dependencies = [ "async-trait", "base64 0.21.4", "futures", "quinn", - "rustls 0.23.9", - "rustls-pemfile 2.0.0", + "rustls 0.21.12", + "rustls-native-certs 0.7.0", + "rustls-pemfile 1.0.3", "rustls-pki-types", "rustls-webpki 0.102.4", "secrecy", "tokio", - "tokio-rustls 0.26.0", + "tokio-rustls 0.24.1", "tokio-util", "tracing", "webpki-roots 0.26.0", + "zenoh-collections", "zenoh-config", "zenoh-core", "zenoh-link-commons", @@ -4219,7 +4238,7 @@ dependencies = [ [[package]] name = "zenoh-link-tcp" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" dependencies = [ "async-trait", "tokio", @@ -4237,21 +4256,22 @@ dependencies = [ [[package]] name = "zenoh-link-tls" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" dependencies = [ "async-trait", "base64 0.21.4", "futures", - "rustls 0.23.9", + "rustls 0.22.4", "rustls-pemfile 2.0.0", "rustls-pki-types", "rustls-webpki 0.102.4", "secrecy", "tokio", - "tokio-rustls 0.26.0", + "tokio-rustls 0.25.0", "tokio-util", "tracing", "webpki-roots 0.26.0", + "zenoh-collections", "zenoh-config", "zenoh-core", "zenoh-link-commons", @@ -4265,7 +4285,7 @@ dependencies = [ [[package]] name = "zenoh-link-udp" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" dependencies = [ "async-trait", "socket2 0.5.6", @@ -4286,7 +4306,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixsock_stream" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" dependencies = [ "async-trait", "futures", @@ -4306,7 +4326,7 @@ dependencies = [ [[package]] name = "zenoh-link-ws" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" dependencies = [ "async-trait", "futures-util", @@ -4327,18 +4347,18 @@ dependencies = [ [[package]] name = "zenoh-macros" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.66", "zenoh-keyexpr", ] [[package]] name = "zenoh-plugin-trait" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" dependencies = [ "const_format", "libloading", @@ -4354,13 +4374,14 @@ dependencies = [ [[package]] name = "zenoh-protocol" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" dependencies = [ "const_format", "rand 0.8.5", "serde", "uhlc", "zenoh-buffers", + "zenoh-collections", "zenoh-keyexpr", "zenoh-result", ] @@ -4368,7 +4389,7 @@ dependencies = [ [[package]] name = "zenoh-result" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" dependencies = [ "anyhow", ] @@ -4376,7 +4397,7 @@ dependencies = [ [[package]] name = "zenoh-runtime" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" dependencies = [ "futures", "lazy_static", @@ -4384,7 +4405,6 @@ dependencies = [ "ron", "serde", "tokio", - "zenoh-collections", "zenoh-macros", "zenoh-result", ] @@ -4392,7 +4412,7 @@ dependencies = [ [[package]] name = "zenoh-sync" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" dependencies = [ "event-listener 4.0.0", "futures", @@ -4406,7 +4426,7 @@ dependencies = [ [[package]] name = "zenoh-task" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" dependencies = [ "futures", "tokio", @@ -4419,7 +4439,7 @@ dependencies = [ [[package]] name = "zenoh-transport" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" dependencies = [ "async-trait", "flume", @@ -4451,7 +4471,7 @@ dependencies = [ [[package]] name = "zenoh-util" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" dependencies = [ "async-std", "async-trait", @@ -4474,7 +4494,7 @@ dependencies = [ [[package]] name = "zenoh_backend_traits" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed6c636a84c00552ca7f7c07d075d5783a40de44" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" dependencies = [ "async-std", "async-trait", @@ -4505,7 +4525,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.66", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 5a2c155..23b5500 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,14 +40,20 @@ async-trait = "0.1.66" base64 = "0.21.0" git-version = "0.3.5" lazy_static = "1.4.0" -serde = { version = "1.0.154", features = ["derive"] } +serde = { version = "1.0.203", features = ["derive"] } serde_json = "1.0.94" tracing = "0.1" uuid = { version = "1.3.0", features = ["v4"] } -zenoh = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = ["unstable"] } -zenoh_backend_traits = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" } -zenoh-plugin-trait = { version = "0.11.0-dev", git = "htttps://github.com/eclipse-zenoh/zenoh", branch = "main" } -zenoh-collections = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" } -zenoh-core = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" } -zenoh-util = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" } +zenoh = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0", features = [ + "unstable", + "internal", +] } +zenoh_backend_traits = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0" } +zenoh-plugin-trait = { version = "0.11.0-dev", git = "htttps://github.com/eclipse-zenoh/zenoh", branch = "dev/1.0.0" } +zenoh-collections = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0" } +zenoh-core = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0" } +zenoh-util = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0" } +zenoh-buffers = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "dev/1.0.0" } +zenoh-protocol = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "dev/1.0.0" } +zenoh-keyexpr = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "dev/1.0.0" } diff --git a/v1/Cargo.toml b/v1/Cargo.toml index 49057bd..e74ae7b 100644 --- a/v1/Cargo.toml +++ b/v1/Cargo.toml @@ -27,18 +27,25 @@ async-trait = { workspace = true } base64 = { workspace = true } git-version = { workspace = true } humantime = "2.1.0" -influxdb = { version = "0.7.1", default-features = false, features = ["derive", "use-serde", "h1-client-rustls"] } +influxdb = { version = "0.7.1", default-features = false, features = [ + "derive", + "use-serde", + "h1-client-rustls", +] } lazy_static = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } tracing = { workspace = true } uuid = { workspace = true } -zenoh = { workspace = true } +zenoh = { workspace = true, features = ["unstable", "internal"] } zenoh_backend_traits = { workspace = true } zenoh-collections = { workspace = true } zenoh-core = { workspace = true } zenoh-util = { workspace = true } zenoh-plugin-trait = { workspace = true } +zenoh-buffers = { workspace = true } +zenoh-protocol = { workspace = true } +zenoh-keyexpr = { workspace = true } [build-dependencies] rustc_version = "0.4.0" diff --git a/v1/src/lib.rs b/v1/src/lib.rs index 1ef5c78..0f1cb3c 100644 --- a/v1/src/lib.rs +++ b/v1/src/lib.rs @@ -21,13 +21,11 @@ use influxdb::{ use serde::Deserialize; use std::convert::{TryFrom, TryInto}; use std::str::FromStr; -use std::sync::Arc; use std::time::{Duration, Instant}; use tracing::{debug, error, warn}; use uuid::Uuid; -use zenoh::buffers::{buffer::SplitBuffer, ZBuf}; -use zenoh::prelude::*; -use zenoh::properties::Properties; +use zenoh::encoding::Encoding; +use zenoh::key_expr::KeyExpr; use zenoh::selector::TimeExpr; use zenoh::time::Timestamp; use zenoh::Result as ZResult; @@ -36,10 +34,16 @@ use zenoh_backend_traits::config::{ }; use zenoh_backend_traits::StorageInsertionResult; use zenoh_backend_traits::*; +use zenoh_buffers::buffer::SplitBuffer; +use zenoh_buffers::ZBuf; use zenoh_core::{bail, zerror}; +use zenoh_keyexpr::{keyexpr, OwnedKeyExpr}; use zenoh_plugin_trait::{plugin_long_version, plugin_version, Plugin}; +use zenoh_protocol::core::Parameters; use zenoh_util::{Timed, TimedEvent, TimedHandle, Timer}; +use zenoh::internal::Value; + // Properties used by the Backend pub const PROP_BACKEND_URL: &str = "url"; pub const PROP_BACKEND_USERNAME: &str = "username"; @@ -279,14 +283,6 @@ impl Volume for InfluxDbVolume { timer: Timer::default(), })) } - - fn incoming_data_interceptor(&self) -> Option Sample + Send + Sync>> { - None - } - - fn outgoing_data_interceptor(&self) -> Option Sample + Send + Sync>> { - None - } } enum OnClosure { @@ -295,9 +291,9 @@ enum OnClosure { DoNothing, } -impl TryFrom<&Properties> for OnClosure { +impl TryFrom<&Parameters<'_>> for OnClosure { type Error = zenoh_core::Error; - fn try_from(p: &Properties) -> ZResult { + fn try_from(p: &Parameters) -> ZResult { match p.get(PROP_STORAGE_ON_CLOSURE) { Some(s) => { if s == "drop_db" { @@ -418,24 +414,29 @@ impl Storage for InfluxDbStorage { } // encode the value as a string to be stored in InfluxDB, converting to base64 if the buffer is not a UTF-8 string - let (base64, strvalue) = match String::from_utf8(value.payload.contiguous().into_owned()) { - Ok(s) => (false, s), - Err(err) => (true, b64_std_engine.encode(err.into_bytes())), - }; + let (base64, strvalue) = + match String::from_utf8(ZBuf::from(value.payload()).contiguous().into_owned()) { + Ok(s) => (false, s), + Err(err) => (true, b64_std_engine.encode(err.into_bytes())), + }; // Note: tags are stored as strings in InfluxDB, while fileds are typed. // For simpler/faster deserialization, we store encoding, timestamp and base64 as fields. // while the kind is stored as a tag to be indexed by InfluxDB and have faster queries on it. + let encoding_string_rep = value.encoding().clone().to_string(); + let encoding: zenoh_protocol::core::Encoding = (value.encoding().clone()).into(); + let query = InfluxWQuery::new( InfluxTimestamp::Nanoseconds(influx_time), measurement.clone(), ) .add_tag("kind", "PUT") .add_field("timestamp", timestamp.to_string()) - .add_field("encoding_prefix", u8::from(*value.encoding.prefix())) - .add_field("encoding_suffix", value.encoding.suffix()) + .add_field("encoding_prefix", u16::from(encoding.id)) + .add_field("encoding_suffix", encoding_string_rep) .add_field("base64", base64) .add_field("value", strvalue); + debug!("Put {:?} with Influx query: {:?}", measurement, query); if let Err(e) = self.client.query(&query).await { bail!( @@ -554,17 +555,15 @@ impl Storage for InfluxDbStorage { // for each point for zpoint in serie.values { // get the encoding - let encoding_prefix = + let encoding_prefix: u16 = zpoint.encoding_prefix.try_into().map_err(|_| { zerror!("Unknown encoding {}", zpoint.encoding_prefix) })?; + let encoding = if zpoint.encoding_suffix.is_empty() { - Encoding::Exact(encoding_prefix) + Encoding::new(encoding_prefix, None) } else { - Encoding::WithSuffix( - encoding_prefix, - zpoint.encoding_suffix.into(), - ) + Encoding::from(zpoint.encoding_suffix) }; // get the payload let payload = if zpoint.base64 { @@ -592,7 +591,7 @@ impl Storage for InfluxDbStorage { continue; } }; - let value = Value::new(payload).encoding(encoding); + let value = Value::new(payload, encoding); result.push(StoredData { value, timestamp }); } } @@ -892,12 +891,12 @@ fn key_exprs_to_influx_regex(path_exprs: &[&keyexpr]) -> String { } fn clauses_from_parameters(p: &str) -> ZResult { - use zenoh::selector::{TimeBound, TimeRange}; - let time_range = p.time_range()?; + use zenoh_util::time_range::{TimeBound, TimeRange}; + let time_range = TimeRange::from_str(p); let mut result = String::with_capacity(256); result.push_str("WHERE kind!='DEL'"); match time_range { - Some(TimeRange(start, stop)) => { + Ok(TimeRange(start, stop)) => { match start { TimeBound::Inclusive(t) => { result.push_str(" AND time >= "); @@ -921,7 +920,8 @@ fn clauses_from_parameters(p: &str) -> ZResult { TimeBound::Unbounded => {} } } - None => { + Err(err) => { + warn!("Error In TimeRange parse from String {}", err); //No time selection, return only latest values result.push_str(" ORDER BY time DESC LIMIT 1"); } From 76831e15de0664150832b65e571c2d86a1775bce Mon Sep 17 00:00:00 2001 From: Charles Schleich Date: Thu, 13 Jun 2024 18:40:06 +0200 Subject: [PATCH 10/16] Update V2 to use zenoh v1.0.0 --- Cargo.lock | 3 ++ v1/src/lib.rs | 4 +-- v2/Cargo.toml | 5 ++- v2/src/lib.rs | 99 ++++++++++++++++++++++++++++----------------------- 4 files changed, 64 insertions(+), 47 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d266503..aae5066 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4070,9 +4070,12 @@ dependencies = [ "tracing", "uuid", "zenoh", + "zenoh-buffers", "zenoh-collections", "zenoh-core", + "zenoh-keyexpr", "zenoh-plugin-trait", + "zenoh-protocol", "zenoh-util", "zenoh_backend_traits", ] diff --git a/v1/src/lib.rs b/v1/src/lib.rs index 0f1cb3c..ed15d11 100644 --- a/v1/src/lib.rs +++ b/v1/src/lib.rs @@ -423,7 +423,7 @@ impl Storage for InfluxDbStorage { // Note: tags are stored as strings in InfluxDB, while fileds are typed. // For simpler/faster deserialization, we store encoding, timestamp and base64 as fields. // while the kind is stored as a tag to be indexed by InfluxDB and have faster queries on it. - let encoding_string_rep = value.encoding().clone().to_string(); + let encoding_string_rep = value.encoding().clone().to_string(); // TODO: This i am not entirely sure about let encoding: zenoh_protocol::core::Encoding = (value.encoding().clone()).into(); let query = InfluxWQuery::new( @@ -433,7 +433,7 @@ impl Storage for InfluxDbStorage { .add_tag("kind", "PUT") .add_field("timestamp", timestamp.to_string()) .add_field("encoding_prefix", u16::from(encoding.id)) - .add_field("encoding_suffix", encoding_string_rep) + .add_field("encoding_suffix", encoding_string_rep) // TODO: This i am not entirely sure about .add_field("base64", base64) .add_field("value", strvalue); diff --git a/v2/Cargo.toml b/v2/Cargo.toml index d83d27d..05d22fc 100644 --- a/v2/Cargo.toml +++ b/v2/Cargo.toml @@ -39,12 +39,15 @@ serde = { workspace = true } serde_json = { workspace = true } tracing = { workspace = true } uuid = { workspace = true } -zenoh = { workspace = true } +zenoh = { workspace = true, features = ["unstable", "internal"] } zenoh_backend_traits = { workspace = true } zenoh-collections = { workspace = true } zenoh-core = { workspace = true } zenoh-util = { workspace = true } zenoh-plugin-trait = { workspace = true } +zenoh-buffers = { workspace = true } +zenoh-protocol = { workspace = true } +zenoh-keyexpr = { workspace = true } [build-dependencies] rustc_version = "0.4.0" diff --git a/v2/src/lib.rs b/v2/src/lib.rs index 082e3ef..8d82a8e 100644 --- a/v2/src/lib.rs +++ b/v2/src/lib.rs @@ -22,28 +22,30 @@ use influxdb2::models::Query; use influxdb2::models::{DataPoint, PostBucketRequest}; use influxdb2::Client; use influxdb2::FromDataPoint; -use zenoh::buffers::ZBuf; +use zenoh::encoding::Encoding; +use zenoh_buffers::ZBuf; +use zenoh_keyexpr::{keyexpr, OwnedKeyExpr}; use zenoh_plugin_trait::{plugin_long_version, plugin_version, Plugin}; use std::convert::{TryFrom, TryInto}; use std::str::FromStr; -use std::sync::Arc; use std::time::{Duration, Instant, UNIX_EPOCH}; use uuid::Uuid; -use zenoh::buffers::buffer::SplitBuffer; -use zenoh::prelude::*; -use zenoh::properties::Properties; use zenoh::selector::TimeExpr; -use zenoh::time::Timestamp; +use zenoh::time::{new_timestamp, Timestamp}; use zenoh::Result as ZResult; use zenoh_backend_traits::config::{ PrivacyGetResult, PrivacyTransparentGet, StorageConfig, VolumeConfig, }; use zenoh_backend_traits::StorageInsertionResult; use zenoh_backend_traits::*; +use zenoh_buffers::buffer::SplitBuffer; use zenoh_core::{bail, zerror}; +use zenoh_protocol::core::Parameters; use zenoh_util::{Timed, TimedEvent, TimedHandle, Timer}; +use zenoh::internal::Value; + // Properties used by the Backend pub const PROP_BACKEND_URL: &str = "url"; pub const PROP_BACKEND_ORG_ID: &str = "org_id"; @@ -322,14 +324,6 @@ impl Volume for InfluxDbVolume { timer: Timer::default(), })) } - - fn incoming_data_interceptor(&self) -> Option Sample + Send + Sync>> { - None - } - - fn outgoing_data_interceptor(&self) -> Option Sample + Send + Sync>> { - None - } } enum OnClosure { @@ -338,9 +332,9 @@ enum OnClosure { DoNothing, } -impl TryFrom<&Properties> for OnClosure { +impl TryFrom<&Parameters<'_>> for OnClosure { type Error = zenoh_core::Error; - fn try_from(p: &Properties) -> ZResult { + fn try_from(p: &Parameters) -> ZResult { match p.get(PROP_STORAGE_ON_CLOSURE) { Some(s) => { if s == "drop_db" { @@ -475,21 +469,25 @@ impl Storage for InfluxDbStorage { // Note: assume that uhlc timestamp was generated by a clock using UNIX_EPOCH (that's the case by default) // encode the value as a string to be stored in InfluxDB, converting to base64 if the buffer is not a UTF-8 string - let (base64, strvalue) = match String::from_utf8(value.payload.contiguous().into_owned()) { - Ok(s) => (false, s), - Err(err) => (true, b64_std_engine.encode(err.into_bytes())), - }; + let (base64, strvalue) = + match String::from_utf8(ZBuf::from(value.payload()).contiguous().into_owned()) { + Ok(s) => (false, s), + Err(err) => (true, b64_std_engine.encode(err.into_bytes())), + }; let db = get_db_name(self.config.clone())?; // Note: tags are stored as strings in InfluxDB, while fileds are typed. // For simpler/faster deserialization, we store encoding, timestamp and base64 as fields. // while the kind is stored as a tag to be indexed by InfluxDB and have faster queries on it. + let encoding_string_rep = value.encoding().clone().to_string(); // TODO: This i am not entirely sure about + let encoding: zenoh_protocol::core::Encoding = (value.encoding().clone()).into(); + let zenoh_point = vec![DataPoint::builder(measurement.clone()) .tag("kind", "PUT") .field("timestamp", timestamp.to_string()) - .field("encoding_prefix", u8::from(*value.encoding.prefix()) as i64) //should be u8 but not supported in v2.x so using a workaround - .field("encoding_suffix", value.encoding.suffix()) + .field("encoding_prefix", u16::from(encoding.id) as i64) //should be u8 but not supported in v2.x so using a workaround + .field("encoding_suffix", encoding_string_rep) // TODO: This i am not entirely sure about .field("base64", base64) .field("value", strvalue) .timestamp(influx_time) //converted timestamp to i64 @@ -520,11 +518,12 @@ impl Storage for InfluxDbStorage { let db = get_db_name(self.config.clone())?; let start_timestamp = NaiveDateTime::UNIX_EPOCH; - let stop_timestamp = NaiveDateTime::from_timestamp_opt( + let stop_timestamp = chrono::DateTime::from_timestamp( timestamp.get_time().as_secs() as i64, timestamp.get_time().subsec_nanos(), ) - .expect("Couldn't convert uhlc timestamp to naivedatetime"); + .ok_or_else(|| zerror!("delete: stop_timestamp out of range"))? + .naive_utc(); let predicate = None; //can be specified with tag or field values tracing::debug!( @@ -654,23 +653,24 @@ impl Storage for InfluxDbStorage { for zpoint in query_result { // get the encoding - let encoding_prefix = - (if zpoint.encoding_prefix >= 0 && zpoint.encoding_prefix <= 255 { - Ok(zpoint.encoding_prefix as u8) - } else { - Err(zerror!( - "Encoding {} is outside possible range of values", - zpoint.encoding_prefix - )) - }) - .and_then(|prefix| { - KnownEncoding::try_from(prefix) - .map_err(|_| zerror!("Unknown encoding {}", zpoint.encoding_prefix)) - })?; + let encoding_prefix = (if zpoint.encoding_prefix >= 0 && zpoint.encoding_prefix <= 255 { + Ok(zpoint.encoding_prefix as u16) + } else { + Err(zerror!( + "Encoding {} is outside possible range of values", + zpoint.encoding_prefix + )) + })?; + // let encoding = if zpoint.encoding_suffix.is_empty() { + // Encoding::Exact(encoding_prefix) + // } else { + // Encoding::WithSuffix(encoding_prefix, zpoint.encoding_suffix.into()) + // }; + let encoding = if zpoint.encoding_suffix.is_empty() { - Encoding::Exact(encoding_prefix) + Encoding::new(encoding_prefix, None) } else { - Encoding::WithSuffix(encoding_prefix, zpoint.encoding_suffix.into()) + Encoding::from(zpoint.encoding_suffix) }; // get the payload let payload = if zpoint.base64 { @@ -700,7 +700,7 @@ impl Storage for InfluxDbStorage { continue; } }; - let value = Value::new(payload).encoding(encoding); + let value = Value::new(payload, encoding); result.push(StoredData { value, timestamp }); } Ok(result) @@ -708,9 +708,16 @@ impl Storage for InfluxDbStorage { //putting a stub here to be implemented later async fn get_all_entries(&self) -> ZResult, Timestamp)>> { + tracing::warn!("!!! get_all_entries is NOT implemented yet !!!"); // See : https://github.com/ZettaScaleLabs/zenoh-backend-influxdb/pull/4 tracing::warn!("called get_all_entries in InfluxDBv2 storage"); let mut result: Vec<(Option, Timestamp)> = Vec::new(); - let curr_time = zenoh::time::new_reception_timestamp(); + let curr_time = match std::num::NonZeroU128::new(1u128).map(new_timestamp) { + Some(x) => x, + None => { + bail!("Error Creating Timestamp ID for 0x01"); + } + }; + result.push((None, curr_time)); return Ok(result); } @@ -848,10 +855,10 @@ fn key_exprs_to_influx_regex(path_exprs: &[&keyexpr]) -> String { fn timerange_from_parameters(p: &str) -> ZResult> { use zenoh::selector::{TimeBound, TimeRange}; - let time_range = p.time_range()?; + let time_range = TimeRange::from_str(p); let mut result = String::new(); match time_range { - Some(TimeRange(start, stop)) => { + Ok(TimeRange(start, stop)) => { match start { TimeBound::Inclusive(t) => { result.push_str("start:"); @@ -875,7 +882,11 @@ fn timerange_from_parameters(p: &str) -> ZResult> { TimeBound::Unbounded => {} } } - None => return Ok(None), + Err(err) => Err(zerror!( + "Could not Make TimeRange From string {} Err :{}", + p, + err + ))?, } Ok(Some(result)) From 8e0f60e1732985a1c7b58201918c923278b2f049 Mon Sep 17 00:00:00 2001 From: Charles Schleich Date: Mon, 17 Jun 2024 12:56:04 +0200 Subject: [PATCH 11/16] fmt --- v1/src/lib.rs | 4 ++-- v2/src/lib.rs | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/v1/src/lib.rs b/v1/src/lib.rs index ed15d11..c9ab203 100644 --- a/v1/src/lib.rs +++ b/v1/src/lib.rs @@ -423,7 +423,7 @@ impl Storage for InfluxDbStorage { // Note: tags are stored as strings in InfluxDB, while fileds are typed. // For simpler/faster deserialization, we store encoding, timestamp and base64 as fields. // while the kind is stored as a tag to be indexed by InfluxDB and have faster queries on it. - let encoding_string_rep = value.encoding().clone().to_string(); // TODO: This i am not entirely sure about + let encoding_string_rep = value.encoding().clone().to_string(); // TODO: This i am not entirely sure about let encoding: zenoh_protocol::core::Encoding = (value.encoding().clone()).into(); let query = InfluxWQuery::new( @@ -433,7 +433,7 @@ impl Storage for InfluxDbStorage { .add_tag("kind", "PUT") .add_field("timestamp", timestamp.to_string()) .add_field("encoding_prefix", u16::from(encoding.id)) - .add_field("encoding_suffix", encoding_string_rep) // TODO: This i am not entirely sure about + .add_field("encoding_suffix", encoding_string_rep) // TODO: This i am not entirely sure about .add_field("base64", base64) .add_field("value", strvalue); diff --git a/v2/src/lib.rs b/v2/src/lib.rs index 8d82a8e..5e13e25 100644 --- a/v2/src/lib.rs +++ b/v2/src/lib.rs @@ -31,6 +31,7 @@ use std::convert::{TryFrom, TryInto}; use std::str::FromStr; use std::time::{Duration, Instant, UNIX_EPOCH}; use uuid::Uuid; +use zenoh::internal::Value; use zenoh::selector::TimeExpr; use zenoh::time::{new_timestamp, Timestamp}; use zenoh::Result as ZResult; @@ -44,8 +45,6 @@ use zenoh_core::{bail, zerror}; use zenoh_protocol::core::Parameters; use zenoh_util::{Timed, TimedEvent, TimedHandle, Timer}; -use zenoh::internal::Value; - // Properties used by the Backend pub const PROP_BACKEND_URL: &str = "url"; pub const PROP_BACKEND_ORG_ID: &str = "org_id"; From 3e16e0401280c0bd803bc5f21560a7a6a99f879b Mon Sep 17 00:00:00 2001 From: Charles Schleich Date: Mon, 17 Jun 2024 17:13:53 +0200 Subject: [PATCH 12/16] Remove internal zenoh Crates from dependencies --- Cargo.lock | 1390 +++++++++++++++++++++++++++++++------------------ Cargo.toml | 6 - v1/Cargo.toml | 8 +- v1/src/lib.rs | 28 +- v2/Cargo.toml | 6 - v2/src/lib.rs | 30 +- 6 files changed, 912 insertions(+), 556 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index aae5066..837656d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -39,9 +39,9 @@ dependencies = [ [[package]] name = "aes" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher 0.4.4", @@ -84,12 +84,12 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.7" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", - "getrandom 0.2.10", + "getrandom 0.2.15", "once_cell", "version_check", "zerocopy", @@ -97,18 +97,18 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.5" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "android-tzdata" @@ -127,9 +127,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "array-init" @@ -154,56 +154,68 @@ dependencies = [ "futures-core", ] +[[package]] +name = "async-channel" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" +dependencies = [ + "concurrent-queue", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + [[package]] name = "async-dup" -version = "1.2.2" +version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7427a12b8dc09291528cfb1da2447059adb4a257388c2acd6497a79d55cf6f7c" +checksum = "7c2886ab563af5038f79ec016dd7b87947ed138b794e8dd64992962c9cca0411" dependencies = [ + "async-lock 3.4.0", "futures-io", - "simple-mutex", ] [[package]] name = "async-executor" -version = "1.5.1" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" +checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" dependencies = [ - "async-lock", "async-task", "concurrent-queue", - "fastrand", - "futures-lite", + "fastrand 2.1.0", + "futures-lite 2.3.0", "slab", ] [[package]] name = "async-global-executor" -version = "2.3.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" +checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" dependencies = [ - "async-channel", + "async-channel 2.3.1", "async-executor", - "async-io", - "async-lock", + "async-io 2.3.3", + "async-lock 3.4.0", "blocking", - "futures-lite", + "futures-lite 2.3.0", "once_cell", "tokio", ] [[package]] name = "async-h1" -version = "2.3.3" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8101020758a4fc3a7c326cb42aa99e9fa77cbfb76987c128ad956406fe1f70a7" +checksum = "5d1d1dae8cb2c4258a79d6ed088b7fb9b4763bf4e9b22d040779761e046a2971" dependencies = [ - "async-channel", + "async-channel 1.9.0", "async-dup", - "async-std", - "futures-core", + "async-global-executor", + "async-io 1.13.0", + "futures-lite 1.13.0", "http-types", "httparse", "log", @@ -216,20 +228,39 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ - "async-lock", + "async-lock 2.8.0", "autocfg", "cfg-if", "concurrent-queue", - "futures-lite", + "futures-lite 1.13.0", "log", "parking", - "polling", - "rustix", + "polling 2.8.0", + "rustix 0.37.27", "slab", - "socket2 0.4.9", + "socket2 0.4.10", "waker-fn", ] +[[package]] +name = "async-io" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" +dependencies = [ + "async-lock 3.4.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.3.0", + "parking", + "polling 3.7.2", + "rustix 0.38.34", + "slab", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "async-lock" version = "2.8.0" @@ -239,40 +270,68 @@ dependencies = [ "event-listener 2.5.3", ] +[[package]] +name = "async-lock" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" +dependencies = [ + "event-listener 5.3.1", + "event-listener-strategy", + "pin-project-lite", +] + [[package]] name = "async-process" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" dependencies = [ - "async-io", - "async-lock", - "autocfg", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", "blocking", "cfg-if", - "event-listener 2.5.3", - "futures-lite", - "rustix", - "signal-hook", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.34", "windows-sys 0.48.0", ] +[[package]] +name = "async-signal" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" +dependencies = [ + "async-io 2.3.3", + "async-lock 3.4.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.34", + "signal-hook-registry", + "slab", + "windows-sys 0.52.0", +] + [[package]] name = "async-std" version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" dependencies = [ - "async-channel", + "async-channel 1.9.0", "async-global-executor", - "async-io", - "async-lock", + "async-io 1.13.0", + "async-lock 2.8.0", "async-process", "crossbeam-utils", "futures-channel", "futures-core", "futures-io", - "futures-lite", + "futures-lite 1.13.0", "gloo-timers", "kv-log-macro", "log", @@ -286,9 +345,9 @@ dependencies = [ [[package]] name = "async-task" -version = "4.4.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-tls" @@ -305,9 +364,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", @@ -316,21 +375,21 @@ dependencies = [ [[package]] name = "atomic-waker" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -361,9 +420,15 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.4" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64ct" @@ -406,36 +471,34 @@ dependencies = [ [[package]] name = "blocking" -version = "1.3.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ - "async-channel", - "async-lock", + "async-channel 2.3.1", "async-task", - "atomic-waker", - "fastrand", - "futures-lite", - "log", + "futures-io", + "futures-lite 2.3.0", + "piper", ] [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "cache-padded" @@ -445,12 +508,9 @@ checksum = "981520c98f422fcc584dc1a95c334e6953900b9106bc47a9839b81790009eb21" [[package]] name = "cc" -version = "1.0.83" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" [[package]] name = "cfg-if" @@ -470,7 +530,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.0", + "windows-targets 0.52.5", ] [[package]] @@ -494,9 +554,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.2.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] @@ -514,30 +574,30 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "const_fn" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" +checksum = "373e9fafaa20882876db20562275ff58d50e0caa2590077fe7ce7bef90211d0d" [[package]] name = "const_format" -version = "0.2.31" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c990efc7a285731f9a4378d81aff2f0e85a2c8781a05ef0f8baa8dac54d0ff48" +checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" dependencies = [ "const_format_proc_macros", ] [[package]] name = "const_format_proc_macros" -version = "0.2.31" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e026b6ce194a874cb9cf32cd5772d1ef9767cc8fcb5765948d74f37a9d8b2bf6" +checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" dependencies = [ "proc-macro2", "quote", @@ -585,9 +645,9 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] @@ -600,22 +660,18 @@ checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" [[package]] name = "crossbeam-queue" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crypto-common" @@ -674,17 +730,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.0", + "hashbrown 0.14.5", "lock_api", "once_cell", - "parking_lot_core 0.9.8", + "parking_lot_core 0.9.10", ] [[package]] name = "data-encoding" -version = "2.4.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "deadpool" @@ -702,9 +758,9 @@ dependencies = [ [[package]] name = "der" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" dependencies = [ "const-oid", "pem-rfc7468", @@ -713,15 +769,15 @@ dependencies = [ [[package]] name = "derive_more" -version = "0.99.17" +version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "convert_case", "proc-macro2", "quote", "rustc_version 0.4.0", - "syn 1.0.109", + "syn 2.0.66", ] [[package]] @@ -772,6 +828,17 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" +[[package]] +name = "displaydoc" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "doc-comment" version = "0.3.3" @@ -780,21 +847,21 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] name = "dyn-clone" -version = "1.0.13" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbfc4744c1b8f2a09adc0e55242f60b1af195d88596bd8700be74418c056c555" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "either" -version = "1.9.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] @@ -807,9 +874,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -823,15 +890,47 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "4.0.0" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" dependencies = [ "concurrent-queue", "parking", "pin-project-lite", ] +[[package]] +name = "event-listener-strategy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +dependencies = [ + "event-listener 5.3.1", + "pin-project-lite", +] + [[package]] name = "fallible-iterator" version = "0.2.0" @@ -847,6 +946,12 @@ dependencies = [ "instant", ] +[[package]] +name = "fastrand" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" + [[package]] name = "fixedbitset" version = "0.4.2" @@ -873,18 +978,18 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] [[package]] name = "futures" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -897,9 +1002,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -907,15 +1012,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -924,9 +1029,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" @@ -934,7 +1039,7 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", + "fastrand 1.9.0", "futures-core", "futures-io", "memchr", @@ -943,11 +1048,24 @@ dependencies = [ "waker-fn", ] +[[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "fastrand 2.1.0", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", @@ -956,21 +1074,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -1007,9 +1125,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "js-sys", @@ -1030,30 +1148,28 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "git-version" -version = "0.3.5" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6b0decc02f4636b9ccad390dcbe77b722a77efedfa393caf8379a51d5c61899" +checksum = "1ad568aa3db0fcbc81f2f116137f263d7304f512a1209b35b85150d3ef88ad19" dependencies = [ "git-version-macro", - "proc-macro-hack", ] [[package]] name = "git-version-macro" -version = "0.3.5" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe69f1cbdb6e28af2bac214e943b99ce8a0a06b447d15d3e61161b0423139f3f" +checksum = "53010ccb100b96a67bc32c0175f0ed1426b31b655d562898e57325f81c023ac0" dependencies = [ - "proc-macro-hack", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.66", ] [[package]] @@ -1110,9 +1226,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", "allocator-api2", @@ -1120,9 +1236,15 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" [[package]] name = "hkdf" @@ -1155,11 +1277,11 @@ dependencies = [ [[package]] name = "home" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1175,9 +1297,9 @@ dependencies = [ [[package]] name = "http" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -1221,11 +1343,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad" dependencies = [ "anyhow", - "async-channel", + "async-channel 1.9.0", "async-std", "base64 0.13.1", "cookie", - "futures-lite", + "futures-lite 1.13.0", "infer", "pin-project-lite", "rand 0.7.3", @@ -1238,9 +1360,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -1256,9 +1378,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.28" +version = "0.14.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" dependencies = [ "bytes", "futures-channel", @@ -1271,7 +1393,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.6", + "socket2 0.5.7", "tokio", "tower-service", "tracing", @@ -1294,16 +1416,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -1315,24 +1437,144 @@ dependencies = [ "cc", ] +[[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f8ac670d7422d7f76b32e17a5db556510825b29ec9154f235977c9caba61036" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "idna" -version = "0.4.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "4716a3a0933a1d01c2f72450e89596eb51dd34ef3c211ccd875acdf1f8fe47ed" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "icu_normalizer", + "icu_properties", + "smallvec", + "utf8_iter", ] [[package]] name = "indexmap" -version = "2.0.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.5", ] [[package]] @@ -1430,9 +1672,9 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", ] @@ -1443,7 +1685,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", "windows-sys 0.48.0", ] @@ -1480,15 +1722,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -1506,9 +1748,9 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" +checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" dependencies = [ "cpufeatures", ] @@ -1555,25 +1797,35 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libloading" -version = "0.8.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "windows-sys 0.48.0", + "windows-targets 0.52.5", ] [[package]] name = "libm" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.5.0", + "libc", +] [[package]] name = "linux-raw-sys" @@ -1581,11 +1833,23 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "litemap" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" + [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -1593,18 +1857,18 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" dependencies = [ "value-bag", ] [[package]] name = "lz4_flex" -version = "0.11.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ea9b256699eda7b0387ffbc776dd625e28bde3918446381781245b7a50349d8" +checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5" dependencies = [ "twox-hash", ] @@ -1620,9 +1884,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.3" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "mime" @@ -1642,9 +1906,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" dependencies = [ "adler", ] @@ -1666,7 +1930,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.15", ] [[package]] @@ -1709,11 +1973,10 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" dependencies = [ - "autocfg", "num-integer", "num-traits", ] @@ -1737,19 +2000,18 @@ dependencies = [ [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-iter" -version = "0.1.43" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", @@ -1758,9 +2020,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", "libm", @@ -1772,15 +2034,15 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", ] [[package]] name = "object" -version = "0.32.1" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" dependencies = [ "memchr", ] @@ -1793,9 +2055,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "opaque-debug" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openssl-probe" @@ -1820,9 +2082,9 @@ dependencies = [ [[package]] name = "ordered-float" -version = "4.1.1" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "536900a8093134cf9ccf00a27deb3532421099e958d9dd431135d0c7543ca1e8" +checksum = "a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e" dependencies = [ "num-traits", ] @@ -1835,9 +2097,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "parking" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" @@ -1866,22 +2128,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall 0.5.2", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pem-rfc7468" @@ -1894,15 +2156,15 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.3" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a4d085fd991ac8d5b05a147b437791b4260b76326baf0fc60cf7c9c27ecd33" +checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" dependencies = [ "memchr", "thiserror", @@ -1911,9 +2173,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.3" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bee7be22ce7918f641a33f08e3f43388c7656772244e2bbb2477f44cc9021a" +checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" dependencies = [ "pest", "pest_generator", @@ -1921,9 +2183,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.3" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1511785c5e98d79a05e8a6bc34b4ac2168a0e3e92161862030ad84daa223141" +checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" dependencies = [ "pest", "pest_meta", @@ -1934,20 +2196,20 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.7.3" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42f0394d3123e33353ca5e1e89092e533d2cc490389f2bd6131c43c634ebc5f" +checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" dependencies = [ "once_cell", "pest", - "sha2 0.10.7", + "sha2 0.10.8", ] [[package]] name = "petgraph" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", "indexmap", @@ -1997,18 +2259,18 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", @@ -2017,9 +2279,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -2027,6 +2289,17 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "piper" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" +dependencies = [ + "atomic-waker", + "fastrand 2.1.0", + "futures-io", +] + [[package]] name = "pkcs1" version = "0.7.5" @@ -2096,6 +2369,21 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "polling" +version = "3.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" +dependencies = [ + "cfg-if", + "concurrent-queue", + "hermit-abi 0.4.0", + "pin-project-lite", + "rustix 0.38.34", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "polyval" version = "0.4.5" @@ -2171,7 +2459,7 @@ checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7" dependencies = [ "bytes", "libc", - "socket2 0.5.6", + "socket2 0.5.7", "tracing", "windows-sys 0.48.0", ] @@ -2244,7 +2532,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.15", ] [[package]] @@ -2267,34 +2555,34 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", ] [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ - "getrandom 0.2.10", - "redox_syscall 0.2.16", + "getrandom 0.2.15", + "libredox", "thiserror", ] [[package]] name = "regex" -version = "1.9.5" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.8", - "regex-syntax 0.7.5", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", ] [[package]] @@ -2308,13 +2596,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.5", + "regex-syntax 0.8.4", ] [[package]] @@ -2325,9 +2613,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "reqwest" @@ -2335,7 +2623,7 @@ version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ - "base64 0.21.4", + "base64 0.21.7", "bytes", "encoding_rs", "futures-core", @@ -2353,7 +2641,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rustls 0.21.12", - "rustls-pemfile 1.0.3", + "rustls-pemfile 1.0.4", "serde", "serde_json", "serde_urlencoded", @@ -2389,16 +2677,17 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.6" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "684d5e6e18f669ccebf64a92236bb7db9a34f07be010e3627368182027180866" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", - "getrandom 0.2.10", + "cfg-if", + "getrandom 0.2.15", "libc", "spin 0.9.8", "untrusted 0.9.0", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2417,7 +2706,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ - "base64 0.21.4", + "base64 0.21.7", "bitflags 2.5.0", "serde", "serde_derive", @@ -2425,16 +2714,14 @@ dependencies = [ [[package]] name = "rsa" -version = "0.9.2" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ab43bb47d23c1a631b4b680199a45255dce26fa9ab2fa902581f624ff13e6a8" +checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" dependencies = [ - "byteorder", "const-oid", "digest 0.10.7", "num-bigint-dig", "num-integer", - "num-iter", "num-traits", "pkcs1", "pkcs8", @@ -2447,9 +2734,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -2472,23 +2759,36 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.18", + "semver 1.0.23", ] [[package]] name = "rustix" -version = "0.37.25" +version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4eb579851244c2c03e7c24f501c3432bed80b8f720af1d6e5b0e0f01555a035" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ "bitflags 1.3.2", "errno", "io-lifetimes", "libc", - "linux-raw-sys", + "linux-raw-sys 0.3.8", "windows-sys 0.48.0", ] +[[package]] +name = "rustix" +version = "0.38.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +dependencies = [ + "bitflags 2.5.0", + "errno", + "libc", + "linux-raw-sys 0.4.14", + "windows-sys 0.52.0", +] + [[package]] name = "rustls" version = "0.18.1" @@ -2509,7 +2809,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", - "ring 0.17.6", + "ring 0.17.8", "rustls-webpki 0.101.7", "sct 0.7.1", ] @@ -2521,7 +2821,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" dependencies = [ "log", - "ring 0.17.6", + "ring 0.17.8", "rustls-pki-types", "rustls-webpki 0.102.4", "subtle", @@ -2535,7 +2835,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls-pemfile 1.0.3", + "rustls-pemfile 1.0.4", "schannel", "security-framework", ] @@ -2547,7 +2847,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" dependencies = [ "openssl-probe", - "rustls-pemfile 2.0.0", + "rustls-pemfile 2.1.2", "rustls-pki-types", "schannel", "security-framework", @@ -2555,20 +2855,20 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.4", + "base64 0.21.7", ] [[package]] name = "rustls-pemfile" -version = "2.0.0" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e4980fa29e4c4b212ffb3db068a564cbf560e51d3944b7c88bd8bf5bec64f4" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ - "base64 0.21.4", + "base64 0.22.1", "rustls-pki-types", ] @@ -2584,7 +2884,7 @@ version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.6", + "ring 0.17.8", "untrusted 0.9.0", ] @@ -2594,31 +2894,31 @@ version = "0.102.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" dependencies = [ - "ring 0.17.6", + "ring 0.17.8", "rustls-pki-types", "untrusted 0.9.0", ] [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "schannel" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "schemars" -version = "0.8.13" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763f8cd0d4c71ed8389c90cb8100cba87e763bd01a8e614d4f0af97bcd50a161" +checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" dependencies = [ "dyn-clone", "schemars_derive", @@ -2628,14 +2928,14 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.13" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0f696e21e10fa546b7ffb1c9672c6de8fbc7a81acf59524386d8639bf12737" +checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 1.0.109", + "syn 2.0.66", ] [[package]] @@ -2660,7 +2960,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.17.6", + "ring 0.17.8", "untrusted 0.9.0", ] @@ -2708,9 +3008,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.18" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "semver-parser" @@ -2763,13 +3063,13 @@ dependencies = [ [[package]] name = "serde_derive_internals" -version = "0.26.0" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.66", ] [[package]] @@ -2808,9 +3108,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.25" +version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ "indexmap", "itoa", @@ -2830,9 +3130,9 @@ dependencies = [ [[package]] name = "sha1" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", "cpufeatures", @@ -2860,9 +3160,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -2897,44 +3197,25 @@ dependencies = [ "dirs", ] -[[package]] -name = "signal-hook" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" -dependencies = [ - "libc", - "signal-hook-registry", -] - [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] [[package]] name = "signature" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "digest 0.10.7", "rand_core 0.6.4", ] -[[package]] -name = "simple-mutex" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38aabbeafa6f6dead8cebf246fe9fae1f9215c8d29b3a69f93bd62a9e4a3dcd6" -dependencies = [ - "event-listener 2.5.3", -] - [[package]] name = "siphasher" version = "0.3.11" @@ -2952,9 +3233,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.0" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "snafu" @@ -2979,9 +3260,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ "libc", "winapi", @@ -2989,9 +3270,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", @@ -3014,14 +3295,20 @@ dependencies = [ [[package]] name = "spki" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ "base64ct", "der", ] +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + [[package]] name = "standback" version = "0.2.17" @@ -3092,7 +3379,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af91f480ee899ab2d9f8435bfdfc14d08a5754bd9d3fef1f1a1c23336aad6c8b" dependencies = [ - "async-channel", + "async-channel 1.9.0", "cfg-if", "futures-core", "pin-project-lite", @@ -3114,7 +3401,7 @@ dependencies = [ "async-trait", "cfg-if", "futures-util", - "getrandom 0.2.10", + "getrandom 0.2.15", "http-client", "http-types", "log", @@ -3154,6 +3441,17 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "system-configuration" version = "0.5.1" @@ -3177,18 +3475,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", @@ -3243,6 +3541,16 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", +] + [[package]] name = "tinyvec" version = "1.6.0" @@ -3269,9 +3577,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.36.0" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", @@ -3279,16 +3587,16 @@ dependencies = [ "mio", "num_cpus", "pin-project-lite", - "socket2 0.5.6", + "socket2 0.5.7", "tokio-macros", "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", @@ -3330,18 +3638,17 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "futures-util", - "hashbrown 0.14.0", + "hashbrown 0.14.5", "pin-project-lite", "tokio", - "tracing", ] [[package]] @@ -3352,11 +3659,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "log", "pin-project-lite", "tracing-attributes", @@ -3365,9 +3671,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", @@ -3376,9 +3682,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", @@ -3441,11 +3747,11 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http 1.0.0", + "http 1.1.0", "httparse", "log", "rand 0.8.5", - "sha1 0.10.5", + "sha1 0.10.6", "thiserror", "url", "utf-8", @@ -3463,9 +3769,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "ucd-trie" @@ -3496,27 +3802,12 @@ dependencies = [ "version_check", ] -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - [[package]] name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - [[package]] name = "unicode-xid" version = "0.2.4" @@ -3535,9 +3826,9 @@ dependencies = [ [[package]] name = "unsafe-libyaml" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" [[package]] name = "untrusted" @@ -3570,9 +3861,9 @@ dependencies = [ [[package]] name = "url" -version = "2.4.1" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56" dependencies = [ "form_urlencoded", "idna", @@ -3586,13 +3877,25 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "uuid" -version = "1.4.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.15", ] [[package]] @@ -3627,9 +3930,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "value-bag" -version = "1.4.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d92ccd67fb88503048c01b59152a04effd0782d035a83a6d256ce6085f08f4a3" +checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101" [[package]] name = "vec_map" @@ -3645,9 +3948,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "waker-fn" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" [[package]] name = "want" @@ -3672,9 +3975,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -3682,9 +3985,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", @@ -3697,9 +4000,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -3709,9 +4012,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3719,9 +4022,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", @@ -3732,9 +4035,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-streams" @@ -3751,9 +4054,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -3786,9 +4089,9 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "webpki-roots" -version = "0.26.0" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de2cfda980f21be5a7ed2eadb3e6fe074d56022bea2cdeb1a62eb220fc04188" +checksum = "3c452ad30530b54a4d8e71952716a212b08efd0f3562baa66c29a618b07da7c3" dependencies = [ "rustls-pki-types", ] @@ -3816,12 +4119,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] @@ -3839,7 +4142,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.5", ] [[package]] @@ -3859,17 +4162,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -3880,9 +4184,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -3892,9 +4196,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -3904,9 +4208,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -3916,9 +4226,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -3928,9 +4238,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -3940,9 +4250,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -3952,9 +4262,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winreg" @@ -3966,22 +4276,58 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + +[[package]] +name = "yoke" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", + "synstructure", +] + [[package]] name = "zenoh" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#2fccc37bb2dbe38558d58072be63dfe01ed350bd" dependencies = [ "ahash", "async-trait", - "base64 0.21.4", + "base64 0.21.7", "const_format", - "event-listener 4.0.0", + "event-listener 4.0.3", "flume", "form_urlencoded", "futures", "git-version", "lazy_static", - "ordered-float 4.1.1", + "ordered-float 4.2.0", "paste", "petgraph", "phf", @@ -3993,7 +4339,7 @@ dependencies = [ "serde_cbor", "serde_json", "serde_yaml", - "socket2 0.5.6", + "socket2 0.5.7", "stop-token", "tokio", "tokio-util", @@ -4027,7 +4373,7 @@ version = "0.11.0-dev" dependencies = [ "async-std", "async-trait", - "base64 0.21.4", + "base64 0.21.7", "git-version", "humantime", "influxdb", @@ -4038,13 +4384,7 @@ dependencies = [ "tracing", "uuid", "zenoh", - "zenoh-buffers", - "zenoh-collections", - "zenoh-core", - "zenoh-keyexpr", "zenoh-plugin-trait", - "zenoh-protocol", - "zenoh-util", "zenoh_backend_traits", ] @@ -4054,7 +4394,7 @@ version = "0.11.0-dev" dependencies = [ "async-std", "async-trait", - "base64 0.21.4", + "base64 0.21.7", "chrono", "futures", "git-version", @@ -4070,20 +4410,14 @@ dependencies = [ "tracing", "uuid", "zenoh", - "zenoh-buffers", - "zenoh-collections", - "zenoh-core", - "zenoh-keyexpr", "zenoh-plugin-trait", - "zenoh-protocol", - "zenoh-util", "zenoh_backend_traits", ] [[package]] name = "zenoh-buffers" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#2fccc37bb2dbe38558d58072be63dfe01ed350bd" dependencies = [ "zenoh-collections", ] @@ -4091,7 +4425,7 @@ dependencies = [ [[package]] name = "zenoh-codec" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#2fccc37bb2dbe38558d58072be63dfe01ed350bd" dependencies = [ "serde", "tracing", @@ -4103,12 +4437,12 @@ dependencies = [ [[package]] name = "zenoh-collections" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#2fccc37bb2dbe38558d58072be63dfe01ed350bd" [[package]] name = "zenoh-config" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#2fccc37bb2dbe38558d58072be63dfe01ed350bd" dependencies = [ "flume", "json5", @@ -4121,6 +4455,7 @@ dependencies = [ "uhlc", "validated_struct", "zenoh-core", + "zenoh-macros", "zenoh-protocol", "zenoh-result", "zenoh-util", @@ -4129,7 +4464,7 @@ dependencies = [ [[package]] name = "zenoh-core" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#2fccc37bb2dbe38558d58072be63dfe01ed350bd" dependencies = [ "async-global-executor", "lazy_static", @@ -4141,9 +4476,9 @@ dependencies = [ [[package]] name = "zenoh-crypto" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#2fccc37bb2dbe38558d58072be63dfe01ed350bd" dependencies = [ - "aes 0.8.3", + "aes 0.8.4", "hmac 0.12.1", "rand 0.8.5", "rand_chacha 0.3.1", @@ -4154,9 +4489,9 @@ dependencies = [ [[package]] name = "zenoh-keyexpr" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#2fccc37bb2dbe38558d58072be63dfe01ed350bd" dependencies = [ - "hashbrown 0.14.0", + "hashbrown 0.14.5", "keyed-set", "rand 0.8.5", "schemars", @@ -4168,7 +4503,7 @@ dependencies = [ [[package]] name = "zenoh-link" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#2fccc37bb2dbe38558d58072be63dfe01ed350bd" dependencies = [ "async-trait", "zenoh-config", @@ -4186,7 +4521,7 @@ dependencies = [ [[package]] name = "zenoh-link-commons" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#2fccc37bb2dbe38558d58072be63dfe01ed350bd" dependencies = [ "async-trait", "flume", @@ -4210,15 +4545,15 @@ dependencies = [ [[package]] name = "zenoh-link-quic" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#2fccc37bb2dbe38558d58072be63dfe01ed350bd" dependencies = [ "async-trait", - "base64 0.21.4", + "base64 0.21.7", "futures", "quinn", "rustls 0.21.12", "rustls-native-certs 0.7.0", - "rustls-pemfile 1.0.3", + "rustls-pemfile 1.0.4", "rustls-pki-types", "rustls-webpki 0.102.4", "secrecy", @@ -4226,7 +4561,7 @@ dependencies = [ "tokio-rustls 0.24.1", "tokio-util", "tracing", - "webpki-roots 0.26.0", + "webpki-roots 0.26.2", "zenoh-collections", "zenoh-config", "zenoh-core", @@ -4241,7 +4576,7 @@ dependencies = [ [[package]] name = "zenoh-link-tcp" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#2fccc37bb2dbe38558d58072be63dfe01ed350bd" dependencies = [ "async-trait", "tokio", @@ -4259,13 +4594,13 @@ dependencies = [ [[package]] name = "zenoh-link-tls" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#2fccc37bb2dbe38558d58072be63dfe01ed350bd" dependencies = [ "async-trait", - "base64 0.21.4", + "base64 0.21.7", "futures", "rustls 0.22.4", - "rustls-pemfile 2.0.0", + "rustls-pemfile 2.1.2", "rustls-pki-types", "rustls-webpki 0.102.4", "secrecy", @@ -4273,7 +4608,7 @@ dependencies = [ "tokio-rustls 0.25.0", "tokio-util", "tracing", - "webpki-roots 0.26.0", + "webpki-roots 0.26.2", "zenoh-collections", "zenoh-config", "zenoh-core", @@ -4288,10 +4623,10 @@ dependencies = [ [[package]] name = "zenoh-link-udp" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#2fccc37bb2dbe38558d58072be63dfe01ed350bd" dependencies = [ "async-trait", - "socket2 0.5.6", + "socket2 0.5.7", "tokio", "tokio-util", "tracing", @@ -4309,7 +4644,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixsock_stream" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#2fccc37bb2dbe38558d58072be63dfe01ed350bd" dependencies = [ "async-trait", "futures", @@ -4329,7 +4664,7 @@ dependencies = [ [[package]] name = "zenoh-link-ws" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#2fccc37bb2dbe38558d58072be63dfe01ed350bd" dependencies = [ "async-trait", "futures-util", @@ -4350,7 +4685,7 @@ dependencies = [ [[package]] name = "zenoh-macros" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#2fccc37bb2dbe38558d58072be63dfe01ed350bd" dependencies = [ "proc-macro2", "quote", @@ -4361,7 +4696,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-trait" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#2fccc37bb2dbe38558d58072be63dfe01ed350bd" dependencies = [ "const_format", "libloading", @@ -4377,7 +4712,7 @@ dependencies = [ [[package]] name = "zenoh-protocol" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#2fccc37bb2dbe38558d58072be63dfe01ed350bd" dependencies = [ "const_format", "rand 0.8.5", @@ -4392,7 +4727,7 @@ dependencies = [ [[package]] name = "zenoh-result" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#2fccc37bb2dbe38558d58072be63dfe01ed350bd" dependencies = [ "anyhow", ] @@ -4400,7 +4735,7 @@ dependencies = [ [[package]] name = "zenoh-runtime" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#2fccc37bb2dbe38558d58072be63dfe01ed350bd" dependencies = [ "futures", "lazy_static", @@ -4415,9 +4750,9 @@ dependencies = [ [[package]] name = "zenoh-sync" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#2fccc37bb2dbe38558d58072be63dfe01ed350bd" dependencies = [ - "event-listener 4.0.0", + "event-listener 4.0.3", "futures", "tokio", "zenoh-buffers", @@ -4429,7 +4764,7 @@ dependencies = [ [[package]] name = "zenoh-task" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#2fccc37bb2dbe38558d58072be63dfe01ed350bd" dependencies = [ "futures", "tokio", @@ -4442,7 +4777,7 @@ dependencies = [ [[package]] name = "zenoh-transport" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#2fccc37bb2dbe38558d58072be63dfe01ed350bd" dependencies = [ "async-trait", "flume", @@ -4474,7 +4809,7 @@ dependencies = [ [[package]] name = "zenoh-util" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#2fccc37bb2dbe38558d58072be63dfe01ed350bd" dependencies = [ "async-std", "async-trait", @@ -4497,7 +4832,7 @@ dependencies = [ [[package]] name = "zenoh_backend_traits" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#8591dccf9dedb2d56d4778ecba818de077348649" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#2fccc37bb2dbe38558d58072be63dfe01ed350bd" dependencies = [ "async-std", "async-trait", @@ -4513,26 +4848,69 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "zerofrom" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", "syn 2.0.66", + "synstructure", ] [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" + +[[package]] +name = "zerovec" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb2cc8827d6c0994478a15c53f374f46fbd41bea663d809b14744bc42e6b109c" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97cf56601ee5052b4417d90c8755c6683473c926039908196cf35d99f893ebe7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] diff --git a/Cargo.toml b/Cargo.toml index 23b5500..2cadea7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -51,9 +51,3 @@ zenoh = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh. ] } zenoh_backend_traits = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0" } zenoh-plugin-trait = { version = "0.11.0-dev", git = "htttps://github.com/eclipse-zenoh/zenoh", branch = "dev/1.0.0" } -zenoh-collections = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0" } -zenoh-core = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0" } -zenoh-util = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0" } -zenoh-buffers = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "dev/1.0.0" } -zenoh-protocol = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "dev/1.0.0" } -zenoh-keyexpr = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "dev/1.0.0" } diff --git a/v1/Cargo.toml b/v1/Cargo.toml index e74ae7b..37454ce 100644 --- a/v1/Cargo.toml +++ b/v1/Cargo.toml @@ -38,14 +38,8 @@ serde_json = { workspace = true } tracing = { workspace = true } uuid = { workspace = true } zenoh = { workspace = true, features = ["unstable", "internal"] } -zenoh_backend_traits = { workspace = true } -zenoh-collections = { workspace = true } -zenoh-core = { workspace = true } -zenoh-util = { workspace = true } zenoh-plugin-trait = { workspace = true } -zenoh-buffers = { workspace = true } -zenoh-protocol = { workspace = true } -zenoh-keyexpr = { workspace = true } +zenoh_backend_traits = { workspace = true } [build-dependencies] rustc_version = "0.4.0" diff --git a/v1/src/lib.rs b/v1/src/lib.rs index c9ab203..5da6c3d 100644 --- a/v1/src/lib.rs +++ b/v1/src/lib.rs @@ -25,24 +25,22 @@ use std::time::{Duration, Instant}; use tracing::{debug, error, warn}; use uuid::Uuid; use zenoh::encoding::Encoding; +use zenoh::internal::{ + bail, + buffers::{SplitBuffer, ZBuf}, + zerror, Timed, TimedEvent, TimedHandle, Timer, Value, +}; use zenoh::key_expr::KeyExpr; -use zenoh::selector::TimeExpr; +use zenoh::key_expr::{keyexpr, OwnedKeyExpr}; +use zenoh::selector::{Parameters, TimeBound, TimeExpr, TimeRange}; use zenoh::time::Timestamp; -use zenoh::Result as ZResult; +use zenoh::{try_init_log_from_env, Error, Result as ZResult}; use zenoh_backend_traits::config::{ PrivacyGetResult, PrivacyTransparentGet, StorageConfig, VolumeConfig, }; use zenoh_backend_traits::StorageInsertionResult; use zenoh_backend_traits::*; -use zenoh_buffers::buffer::SplitBuffer; -use zenoh_buffers::ZBuf; -use zenoh_core::{bail, zerror}; -use zenoh_keyexpr::{keyexpr, OwnedKeyExpr}; use zenoh_plugin_trait::{plugin_long_version, plugin_version, Plugin}; -use zenoh_protocol::core::Parameters; -use zenoh_util::{Timed, TimedEvent, TimedHandle, Timer}; - -use zenoh::internal::Value; // Properties used by the Backend pub const PROP_BACKEND_URL: &str = "url"; @@ -117,7 +115,7 @@ impl Plugin for InfluxDbBackend { const PLUGIN_LONG_VERSION: &'static str = plugin_long_version!(); fn start(_name: &str, config: &Self::StartArgs) -> ZResult { - zenoh_util::try_init_log_from_env(); + try_init_log_from_env(); debug!("InfluxDB backend {}", Self::PLUGIN_VERSION); @@ -292,7 +290,7 @@ enum OnClosure { } impl TryFrom<&Parameters<'_>> for OnClosure { - type Error = zenoh_core::Error; + type Error = Error; fn try_from(p: &Parameters) -> ZResult { match p.get(PROP_STORAGE_ON_CLOSURE) { Some(s) => { @@ -424,7 +422,7 @@ impl Storage for InfluxDbStorage { // For simpler/faster deserialization, we store encoding, timestamp and base64 as fields. // while the kind is stored as a tag to be indexed by InfluxDB and have faster queries on it. let encoding_string_rep = value.encoding().clone().to_string(); // TODO: This i am not entirely sure about - let encoding: zenoh_protocol::core::Encoding = (value.encoding().clone()).into(); + let encoding: Encoding = (value.encoding().clone()).into(); let query = InfluxWQuery::new( InfluxTimestamp::Nanoseconds(influx_time), @@ -432,7 +430,7 @@ impl Storage for InfluxDbStorage { ) .add_tag("kind", "PUT") .add_field("timestamp", timestamp.to_string()) - .add_field("encoding_prefix", u16::from(encoding.id)) + .add_field("encoding_prefix", u16::from(encoding.id())) .add_field("encoding_suffix", encoding_string_rep) // TODO: This i am not entirely sure about .add_field("base64", base64) .add_field("value", strvalue); @@ -891,7 +889,7 @@ fn key_exprs_to_influx_regex(path_exprs: &[&keyexpr]) -> String { } fn clauses_from_parameters(p: &str) -> ZResult { - use zenoh_util::time_range::{TimeBound, TimeRange}; + // use TimeBound, TimeRange}; let time_range = TimeRange::from_str(p); let mut result = String::with_capacity(256); result.push_str("WHERE kind!='DEL'"); diff --git a/v2/Cargo.toml b/v2/Cargo.toml index 05d22fc..4946458 100644 --- a/v2/Cargo.toml +++ b/v2/Cargo.toml @@ -41,13 +41,7 @@ tracing = { workspace = true } uuid = { workspace = true } zenoh = { workspace = true, features = ["unstable", "internal"] } zenoh_backend_traits = { workspace = true } -zenoh-collections = { workspace = true } -zenoh-core = { workspace = true } -zenoh-util = { workspace = true } zenoh-plugin-trait = { workspace = true } -zenoh-buffers = { workspace = true } -zenoh-protocol = { workspace = true } -zenoh-keyexpr = { workspace = true } [build-dependencies] rustc_version = "0.4.0" diff --git a/v2/src/lib.rs b/v2/src/lib.rs index 5e13e25..b69bd9b 100644 --- a/v2/src/lib.rs +++ b/v2/src/lib.rs @@ -22,28 +22,26 @@ use influxdb2::models::Query; use influxdb2::models::{DataPoint, PostBucketRequest}; use influxdb2::Client; use influxdb2::FromDataPoint; -use zenoh::encoding::Encoding; -use zenoh_buffers::ZBuf; -use zenoh_keyexpr::{keyexpr, OwnedKeyExpr}; -use zenoh_plugin_trait::{plugin_long_version, plugin_version, Plugin}; - use std::convert::{TryFrom, TryInto}; use std::str::FromStr; use std::time::{Duration, Instant, UNIX_EPOCH}; use uuid::Uuid; -use zenoh::internal::Value; -use zenoh::selector::TimeExpr; +use zenoh::encoding::Encoding; +use zenoh::internal::{ + bail, + buffers::{SplitBuffer, ZBuf}, + zerror, Timed, TimedEvent, TimedHandle, Timer, Value, +}; +use zenoh::key_expr::{keyexpr, OwnedKeyExpr}; +use zenoh::selector::{Parameters, TimeExpr}; use zenoh::time::{new_timestamp, Timestamp}; -use zenoh::Result as ZResult; +use zenoh::{try_init_log_from_env, Error, Result as ZResult}; use zenoh_backend_traits::config::{ PrivacyGetResult, PrivacyTransparentGet, StorageConfig, VolumeConfig, }; use zenoh_backend_traits::StorageInsertionResult; use zenoh_backend_traits::*; -use zenoh_buffers::buffer::SplitBuffer; -use zenoh_core::{bail, zerror}; -use zenoh_protocol::core::Parameters; -use zenoh_util::{Timed, TimedEvent, TimedHandle, Timer}; +use zenoh_plugin_trait::{plugin_long_version, plugin_version, Plugin}; // Properties used by the Backend pub const PROP_BACKEND_URL: &str = "url"; @@ -142,7 +140,7 @@ impl Plugin for InfluxDbBackend { const PLUGIN_LONG_VERSION: &'static str = plugin_long_version!(); fn start(_name: &str, config: &Self::StartArgs) -> ZResult { - zenoh_util::try_init_log_from_env(); + try_init_log_from_env(); tracing::debug!("InfluxDBv2 backend {}", Self::PLUGIN_VERSION); @@ -332,7 +330,7 @@ enum OnClosure { } impl TryFrom<&Parameters<'_>> for OnClosure { - type Error = zenoh_core::Error; + type Error = Error; fn try_from(p: &Parameters) -> ZResult { match p.get(PROP_STORAGE_ON_CLOSURE) { Some(s) => { @@ -480,12 +478,12 @@ impl Storage for InfluxDbStorage { // For simpler/faster deserialization, we store encoding, timestamp and base64 as fields. // while the kind is stored as a tag to be indexed by InfluxDB and have faster queries on it. let encoding_string_rep = value.encoding().clone().to_string(); // TODO: This i am not entirely sure about - let encoding: zenoh_protocol::core::Encoding = (value.encoding().clone()).into(); + let encoding: Encoding = (value.encoding().clone()).into(); let zenoh_point = vec![DataPoint::builder(measurement.clone()) .tag("kind", "PUT") .field("timestamp", timestamp.to_string()) - .field("encoding_prefix", u16::from(encoding.id) as i64) //should be u8 but not supported in v2.x so using a workaround + .field("encoding_prefix", u16::from(encoding.id()) as i64) //should be u8 but not supported in v2.x so using a workaround .field("encoding_suffix", encoding_string_rep) // TODO: This i am not entirely sure about .field("base64", base64) .field("value", strvalue) From 5708692cafe694eefe5c0174ba42fda7450ed6a6 Mon Sep 17 00:00:00 2001 From: Charles Schleich Date: Mon, 17 Jun 2024 18:01:58 +0200 Subject: [PATCH 13/16] plugins in Cargo.Toml --- Cargo.toml | 1 + v1/Cargo.toml | 2 +- v2/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 2cadea7..e35e249 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -48,6 +48,7 @@ uuid = { version = "1.3.0", features = ["v4"] } zenoh = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0", features = [ "unstable", "internal", + "plugins" ] } zenoh_backend_traits = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0" } zenoh-plugin-trait = { version = "0.11.0-dev", git = "htttps://github.com/eclipse-zenoh/zenoh", branch = "dev/1.0.0" } diff --git a/v1/Cargo.toml b/v1/Cargo.toml index 37454ce..76ccfb5 100644 --- a/v1/Cargo.toml +++ b/v1/Cargo.toml @@ -37,7 +37,7 @@ serde = { workspace = true } serde_json = { workspace = true } tracing = { workspace = true } uuid = { workspace = true } -zenoh = { workspace = true, features = ["unstable", "internal"] } +zenoh = { workspace = true, features = ["unstable", "internal", "plugins"] } zenoh-plugin-trait = { workspace = true } zenoh_backend_traits = { workspace = true } diff --git a/v2/Cargo.toml b/v2/Cargo.toml index 4946458..795c43d 100644 --- a/v2/Cargo.toml +++ b/v2/Cargo.toml @@ -39,7 +39,7 @@ serde = { workspace = true } serde_json = { workspace = true } tracing = { workspace = true } uuid = { workspace = true } -zenoh = { workspace = true, features = ["unstable", "internal"] } +zenoh = { workspace = true, features = ["unstable", "internal","plugins"] } zenoh_backend_traits = { workspace = true } zenoh-plugin-trait = { workspace = true } From 7ee13a17116a5f1f48e28b254feb91227442b791 Mon Sep 17 00:00:00 2001 From: Charles Schleich Date: Tue, 18 Jun 2024 12:16:17 +0200 Subject: [PATCH 14/16] Cleanup --- v1/src/lib.rs | 15 +++++---------- v2/Cargo.toml | 2 +- v2/src/lib.rs | 8 ++------ 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/v1/src/lib.rs b/v1/src/lib.rs index 5da6c3d..f237c68 100644 --- a/v1/src/lib.rs +++ b/v1/src/lib.rs @@ -25,11 +25,7 @@ use std::time::{Duration, Instant}; use tracing::{debug, error, warn}; use uuid::Uuid; use zenoh::encoding::Encoding; -use zenoh::internal::{ - bail, - buffers::{SplitBuffer, ZBuf}, - zerror, Timed, TimedEvent, TimedHandle, Timer, Value, -}; +use zenoh::internal::{bail, buffers::ZBuf, zerror, Timed, TimedEvent, TimedHandle, Timer, Value}; use zenoh::key_expr::KeyExpr; use zenoh::key_expr::{keyexpr, OwnedKeyExpr}; use zenoh::selector::{Parameters, TimeBound, TimeExpr, TimeRange}; @@ -412,11 +408,10 @@ impl Storage for InfluxDbStorage { } // encode the value as a string to be stored in InfluxDB, converting to base64 if the buffer is not a UTF-8 string - let (base64, strvalue) = - match String::from_utf8(ZBuf::from(value.payload()).contiguous().into_owned()) { - Ok(s) => (false, s), - Err(err) => (true, b64_std_engine.encode(err.into_bytes())), - }; + let (base64, strvalue) = match String::from_utf8(value.payload().into::>()) { + Ok(s) => (false, s), + Err(err) => (true, b64_std_engine.encode(err.into_bytes())), + }; // Note: tags are stored as strings in InfluxDB, while fileds are typed. // For simpler/faster deserialization, we store encoding, timestamp and base64 as fields. diff --git a/v2/Cargo.toml b/v2/Cargo.toml index 795c43d..f5ba012 100644 --- a/v2/Cargo.toml +++ b/v2/Cargo.toml @@ -39,7 +39,7 @@ serde = { workspace = true } serde_json = { workspace = true } tracing = { workspace = true } uuid = { workspace = true } -zenoh = { workspace = true, features = ["unstable", "internal","plugins"] } +zenoh = { workspace = true, features = ["unstable", "internal", "plugins"] } zenoh_backend_traits = { workspace = true } zenoh-plugin-trait = { workspace = true } diff --git a/v2/src/lib.rs b/v2/src/lib.rs index b69bd9b..002a65f 100644 --- a/v2/src/lib.rs +++ b/v2/src/lib.rs @@ -484,7 +484,7 @@ impl Storage for InfluxDbStorage { .tag("kind", "PUT") .field("timestamp", timestamp.to_string()) .field("encoding_prefix", u16::from(encoding.id()) as i64) //should be u8 but not supported in v2.x so using a workaround - .field("encoding_suffix", encoding_string_rep) // TODO: This i am not entirely sure about + .field("encoding_suffix", encoding_string_rep) // TODO: Left for compatibility, consider replacing wiht single "Encoding" field .field("base64", base64) .field("value", strvalue) .timestamp(influx_time) //converted timestamp to i64 @@ -658,11 +658,6 @@ impl Storage for InfluxDbStorage { zpoint.encoding_prefix )) })?; - // let encoding = if zpoint.encoding_suffix.is_empty() { - // Encoding::Exact(encoding_prefix) - // } else { - // Encoding::WithSuffix(encoding_prefix, zpoint.encoding_suffix.into()) - // }; let encoding = if zpoint.encoding_suffix.is_empty() { Encoding::new(encoding_prefix, None) @@ -708,6 +703,7 @@ impl Storage for InfluxDbStorage { tracing::warn!("!!! get_all_entries is NOT implemented yet !!!"); // See : https://github.com/ZettaScaleLabs/zenoh-backend-influxdb/pull/4 tracing::warn!("called get_all_entries in InfluxDBv2 storage"); let mut result: Vec<(Option, Timestamp)> = Vec::new(); + // TODO: Pass real zid from session instead let curr_time = match std::num::NonZeroU128::new(1u128).map(new_timestamp) { Some(x) => x, None => { From 39e91fbf2a060dbb2ff3bf60dbd7bccc1231fad8 Mon Sep 17 00:00:00 2001 From: Charles Schleich Date: Tue, 18 Jun 2024 12:20:33 +0200 Subject: [PATCH 15/16] remove TODO, add comments --- v1/src/lib.rs | 5 ++--- v2/src/lib.rs | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/v1/src/lib.rs b/v1/src/lib.rs index f237c68..107b3fe 100644 --- a/v1/src/lib.rs +++ b/v1/src/lib.rs @@ -416,7 +416,7 @@ impl Storage for InfluxDbStorage { // Note: tags are stored as strings in InfluxDB, while fileds are typed. // For simpler/faster deserialization, we store encoding, timestamp and base64 as fields. // while the kind is stored as a tag to be indexed by InfluxDB and have faster queries on it. - let encoding_string_rep = value.encoding().clone().to_string(); // TODO: This i am not entirely sure about + let encoding_string_rep = value.encoding().clone().to_string(); // add_field only supports Strings and not Vec let encoding: Encoding = (value.encoding().clone()).into(); let query = InfluxWQuery::new( @@ -426,7 +426,7 @@ impl Storage for InfluxDbStorage { .add_tag("kind", "PUT") .add_field("timestamp", timestamp.to_string()) .add_field("encoding_prefix", u16::from(encoding.id())) - .add_field("encoding_suffix", encoding_string_rep) // TODO: This i am not entirely sure about + .add_field("encoding_suffix", encoding_string_rep) // TODO: Rename To Encoding and only keep String rep .add_field("base64", base64) .add_field("value", strvalue); @@ -884,7 +884,6 @@ fn key_exprs_to_influx_regex(path_exprs: &[&keyexpr]) -> String { } fn clauses_from_parameters(p: &str) -> ZResult { - // use TimeBound, TimeRange}; let time_range = TimeRange::from_str(p); let mut result = String::with_capacity(256); result.push_str("WHERE kind!='DEL'"); diff --git a/v2/src/lib.rs b/v2/src/lib.rs index 002a65f..95e2c5a 100644 --- a/v2/src/lib.rs +++ b/v2/src/lib.rs @@ -477,7 +477,7 @@ impl Storage for InfluxDbStorage { // Note: tags are stored as strings in InfluxDB, while fileds are typed. // For simpler/faster deserialization, we store encoding, timestamp and base64 as fields. // while the kind is stored as a tag to be indexed by InfluxDB and have faster queries on it. - let encoding_string_rep = value.encoding().clone().to_string(); // TODO: This i am not entirely sure about + let encoding_string_rep = value.encoding().clone().to_string(); // field only supports Strings and not Vec let encoding: Encoding = (value.encoding().clone()).into(); let zenoh_point = vec![DataPoint::builder(measurement.clone()) From 0b94096a8c08aa586b01565ce9cdee2c83fa9b68 Mon Sep 17 00:00:00 2001 From: Charles Schleich Date: Tue, 18 Jun 2024 12:37:44 +0200 Subject: [PATCH 16/16] Use New API for deserializing payload --- v1/src/lib.rs | 4 ++-- v2/src/lib.rs | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/v1/src/lib.rs b/v1/src/lib.rs index 107b3fe..3e32fcb 100644 --- a/v1/src/lib.rs +++ b/v1/src/lib.rs @@ -408,9 +408,9 @@ impl Storage for InfluxDbStorage { } // encode the value as a string to be stored in InfluxDB, converting to base64 if the buffer is not a UTF-8 string - let (base64, strvalue) = match String::from_utf8(value.payload().into::>()) { + let (base64, strvalue) = match value.payload().deserialize::() { Ok(s) => (false, s), - Err(err) => (true, b64_std_engine.encode(err.into_bytes())), + Err(err) => (true, b64_std_engine.encode(err.to_string())), }; // Note: tags are stored as strings in InfluxDB, while fileds are typed. diff --git a/v2/src/lib.rs b/v2/src/lib.rs index 95e2c5a..aa544a3 100644 --- a/v2/src/lib.rs +++ b/v2/src/lib.rs @@ -466,11 +466,11 @@ impl Storage for InfluxDbStorage { // Note: assume that uhlc timestamp was generated by a clock using UNIX_EPOCH (that's the case by default) // encode the value as a string to be stored in InfluxDB, converting to base64 if the buffer is not a UTF-8 string - let (base64, strvalue) = - match String::from_utf8(ZBuf::from(value.payload()).contiguous().into_owned()) { - Ok(s) => (false, s), - Err(err) => (true, b64_std_engine.encode(err.into_bytes())), - }; + + let (base64, strvalue) = match value.payload().deserialize::() { + Ok(s) => (false, s), + Err(err) => (true, b64_std_engine.encode(err.to_string())), + }; let db = get_db_name(self.config.clone())?;