From d0b4b384bc9ce5645ba5d3ca17030dd7a18fae6e Mon Sep 17 00:00:00 2001 From: eclipse-zenoh-bot <61247838+eclipse-zenoh-bot@users.noreply.github.com> Date: Sat, 27 Jul 2024 02:15:56 +0200 Subject: [PATCH] build: Sync with eclipse-zenoh/zenoh@e587aa9 from 2024-07-26 (#144) Co-authored-by: eclipse-zenoh-bot --- zenoh-jni/Cargo.lock | 86 ++++++++++++++++++++++++++------------------ 1 file changed, 52 insertions(+), 34 deletions(-) diff --git a/zenoh-jni/Cargo.lock b/zenoh-jni/Cargo.lock index 5c37db791..7cac60c34 100644 --- a/zenoh-jni/Cargo.lock +++ b/zenoh-jni/Cargo.lock @@ -503,9 +503,12 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] [[package]] name = "digest" @@ -1213,6 +1216,12 @@ dependencies = [ "zeroize", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-integer" version = "0.1.45" @@ -1508,6 +1517,12 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -2260,12 +2275,14 @@ dependencies = [ [[package]] name = "time" -version = "0.3.28" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", + "num-conv", + "powerfmt", "serde", "time-core", "time-macros", @@ -2273,16 +2290,17 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.14" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] @@ -2970,7 +2988,7 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "zenoh" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f" dependencies = [ "ahash", "async-trait", @@ -3020,7 +3038,7 @@ dependencies = [ [[package]] name = "zenoh-buffers" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f" dependencies = [ "zenoh-collections", ] @@ -3028,7 +3046,7 @@ dependencies = [ [[package]] name = "zenoh-codec" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f" dependencies = [ "serde", "tracing", @@ -3040,12 +3058,12 @@ dependencies = [ [[package]] name = "zenoh-collections" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f" [[package]] name = "zenoh-config" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f" dependencies = [ "flume 0.11.0", "json5", @@ -3065,7 +3083,7 @@ dependencies = [ [[package]] name = "zenoh-core" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f" dependencies = [ "async-global-executor", "lazy_static", @@ -3077,7 +3095,7 @@ dependencies = [ [[package]] name = "zenoh-crypto" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f" dependencies = [ "aes", "hmac", @@ -3090,7 +3108,7 @@ dependencies = [ [[package]] name = "zenoh-ext" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f" dependencies = [ "bincode", "flume 0.11.0", @@ -3111,7 +3129,7 @@ dependencies = [ [[package]] name = "zenoh-keyexpr" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f" dependencies = [ "hashbrown 0.14.0", "keyed-set", @@ -3125,7 +3143,7 @@ dependencies = [ [[package]] name = "zenoh-link" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f" dependencies = [ "async-trait", "zenoh-config", @@ -3143,7 +3161,7 @@ dependencies = [ [[package]] name = "zenoh-link-commons" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f" dependencies = [ "async-trait", "flume 0.11.0", @@ -3167,7 +3185,7 @@ dependencies = [ [[package]] name = "zenoh-link-quic" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f" dependencies = [ "async-trait", "base64", @@ -3196,7 +3214,7 @@ dependencies = [ [[package]] name = "zenoh-link-tcp" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f" dependencies = [ "async-trait", "tokio", @@ -3214,7 +3232,7 @@ dependencies = [ [[package]] name = "zenoh-link-tls" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f" dependencies = [ "async-trait", "base64", @@ -3242,7 +3260,7 @@ dependencies = [ [[package]] name = "zenoh-link-udp" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f" dependencies = [ "async-trait", "socket2 0.5.6", @@ -3263,7 +3281,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixsock_stream" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f" dependencies = [ "async-trait", "futures", @@ -3283,7 +3301,7 @@ dependencies = [ [[package]] name = "zenoh-link-ws" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f" dependencies = [ "async-trait", "futures-util", @@ -3304,7 +3322,7 @@ dependencies = [ [[package]] name = "zenoh-macros" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f" dependencies = [ "proc-macro2", "quote", @@ -3315,7 +3333,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-trait" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f" dependencies = [ "const_format", "libloading", @@ -3331,7 +3349,7 @@ dependencies = [ [[package]] name = "zenoh-protocol" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f" dependencies = [ "const_format", "rand", @@ -3345,7 +3363,7 @@ dependencies = [ [[package]] name = "zenoh-result" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f" dependencies = [ "anyhow", ] @@ -3353,7 +3371,7 @@ dependencies = [ [[package]] name = "zenoh-runtime" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f" dependencies = [ "futures", "lazy_static", @@ -3369,7 +3387,7 @@ dependencies = [ [[package]] name = "zenoh-sync" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f" dependencies = [ "event-listener 4.0.0", "futures", @@ -3383,7 +3401,7 @@ dependencies = [ [[package]] name = "zenoh-task" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f" dependencies = [ "futures", "tokio", @@ -3396,7 +3414,7 @@ dependencies = [ [[package]] name = "zenoh-transport" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f" dependencies = [ "async-trait", "flume 0.11.0", @@ -3428,7 +3446,7 @@ dependencies = [ [[package]] name = "zenoh-util" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0a969cb8bbb670a02b16c0373b133b00d58f1aaf" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e587aa9ce43af6cb78bbe418f478804218f7b19f" dependencies = [ "async-std", "async-trait",