From cc4cb18f5a6b8c659827a494479553ed2ade3531 Mon Sep 17 00:00:00 2001 From: Luca Cominardi Date: Wed, 29 Nov 2023 09:24:36 +0100 Subject: [PATCH] Point to zenoh master --- Cargo.lock | 48 +++++++++++++++++++++++------------------------- Cargo.toml | 6 +++--- 2 files changed, 26 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c3181ba0..29cf5d28 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2682,13 +2682,12 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "zenoh" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feature_cleanup2#b358102888e43ab6a1f6e411aee20156b9ffbf4f" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#fa02cf0640a9a3c26ed00bc0c052ba3cc5d42060" dependencies = [ "async-global-executor", "async-std", "async-trait", "base64", - "const_format", "env_logger", "event-listener", "flume", @@ -2730,7 +2729,7 @@ dependencies = [ [[package]] name = "zenoh-buffers" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feature_cleanup2#b358102888e43ab6a1f6e411aee20156b9ffbf4f" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#fa02cf0640a9a3c26ed00bc0c052ba3cc5d42060" dependencies = [ "zenoh-collections", ] @@ -2738,7 +2737,7 @@ dependencies = [ [[package]] name = "zenoh-codec" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feature_cleanup2#b358102888e43ab6a1f6e411aee20156b9ffbf4f" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#fa02cf0640a9a3c26ed00bc0c052ba3cc5d42060" dependencies = [ "log", "serde", @@ -2750,12 +2749,12 @@ dependencies = [ [[package]] name = "zenoh-collections" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feature_cleanup2#b358102888e43ab6a1f6e411aee20156b9ffbf4f" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#fa02cf0640a9a3c26ed00bc0c052ba3cc5d42060" [[package]] name = "zenoh-config" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feature_cleanup2#b358102888e43ab6a1f6e411aee20156b9ffbf4f" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#fa02cf0640a9a3c26ed00bc0c052ba3cc5d42060" dependencies = [ "flume", "json5", @@ -2774,7 +2773,7 @@ dependencies = [ [[package]] name = "zenoh-core" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feature_cleanup2#b358102888e43ab6a1f6e411aee20156b9ffbf4f" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#fa02cf0640a9a3c26ed00bc0c052ba3cc5d42060" dependencies = [ "async-std", "lazy_static", @@ -2784,7 +2783,7 @@ dependencies = [ [[package]] name = "zenoh-crypto" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feature_cleanup2#b358102888e43ab6a1f6e411aee20156b9ffbf4f" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#fa02cf0640a9a3c26ed00bc0c052ba3cc5d42060" dependencies = [ "aes", "hmac", @@ -2797,7 +2796,7 @@ dependencies = [ [[package]] name = "zenoh-keyexpr" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feature_cleanup2#b358102888e43ab6a1f6e411aee20156b9ffbf4f" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#fa02cf0640a9a3c26ed00bc0c052ba3cc5d42060" dependencies = [ "hashbrown 0.14.0", "keyed-set", @@ -2811,7 +2810,7 @@ dependencies = [ [[package]] name = "zenoh-link" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feature_cleanup2#b358102888e43ab6a1f6e411aee20156b9ffbf4f" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#fa02cf0640a9a3c26ed00bc0c052ba3cc5d42060" dependencies = [ "async-std", "async-trait", @@ -2830,7 +2829,7 @@ dependencies = [ [[package]] name = "zenoh-link-commons" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feature_cleanup2#b358102888e43ab6a1f6e411aee20156b9ffbf4f" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#fa02cf0640a9a3c26ed00bc0c052ba3cc5d42060" dependencies = [ "async-std", "async-trait", @@ -2846,7 +2845,7 @@ dependencies = [ [[package]] name = "zenoh-link-quic" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feature_cleanup2#b358102888e43ab6a1f6e411aee20156b9ffbf4f" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#fa02cf0640a9a3c26ed00bc0c052ba3cc5d42060" dependencies = [ "async-rustls", "async-std", @@ -2872,7 +2871,7 @@ dependencies = [ [[package]] name = "zenoh-link-tcp" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feature_cleanup2#b358102888e43ab6a1f6e411aee20156b9ffbf4f" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#fa02cf0640a9a3c26ed00bc0c052ba3cc5d42060" dependencies = [ "async-std", "async-trait", @@ -2888,7 +2887,7 @@ dependencies = [ [[package]] name = "zenoh-link-tls" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feature_cleanup2#b358102888e43ab6a1f6e411aee20156b9ffbf4f" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#fa02cf0640a9a3c26ed00bc0c052ba3cc5d42060" dependencies = [ "async-rustls", "async-std", @@ -2913,7 +2912,7 @@ dependencies = [ [[package]] name = "zenoh-link-udp" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feature_cleanup2#b358102888e43ab6a1f6e411aee20156b9ffbf4f" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#fa02cf0640a9a3c26ed00bc0c052ba3cc5d42060" dependencies = [ "async-std", "async-trait", @@ -2932,7 +2931,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixsock_stream" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feature_cleanup2#b358102888e43ab6a1f6e411aee20156b9ffbf4f" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#fa02cf0640a9a3c26ed00bc0c052ba3cc5d42060" dependencies = [ "async-std", "async-trait", @@ -2950,7 +2949,7 @@ dependencies = [ [[package]] name = "zenoh-link-ws" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feature_cleanup2#b358102888e43ab6a1f6e411aee20156b9ffbf4f" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#fa02cf0640a9a3c26ed00bc0c052ba3cc5d42060" dependencies = [ "async-std", "async-trait", @@ -2970,7 +2969,7 @@ dependencies = [ [[package]] name = "zenoh-macros" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feature_cleanup2#b358102888e43ab6a1f6e411aee20156b9ffbf4f" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#fa02cf0640a9a3c26ed00bc0c052ba3cc5d42060" dependencies = [ "proc-macro2", "quote", @@ -2983,7 +2982,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-trait" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feature_cleanup2#b358102888e43ab6a1f6e411aee20156b9ffbf4f" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#fa02cf0640a9a3c26ed00bc0c052ba3cc5d42060" dependencies = [ "libloading", "log", @@ -2996,7 +2995,7 @@ dependencies = [ [[package]] name = "zenoh-protocol" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feature_cleanup2#b358102888e43ab6a1f6e411aee20156b9ffbf4f" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#fa02cf0640a9a3c26ed00bc0c052ba3cc5d42060" dependencies = [ "const_format", "hex", @@ -3032,7 +3031,7 @@ dependencies = [ [[package]] name = "zenoh-result" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feature_cleanup2#b358102888e43ab6a1f6e411aee20156b9ffbf4f" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#fa02cf0640a9a3c26ed00bc0c052ba3cc5d42060" dependencies = [ "anyhow", ] @@ -3040,7 +3039,7 @@ dependencies = [ [[package]] name = "zenoh-sync" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feature_cleanup2#b358102888e43ab6a1f6e411aee20156b9ffbf4f" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#fa02cf0640a9a3c26ed00bc0c052ba3cc5d42060" dependencies = [ "async-std", "event-listener", @@ -3055,7 +3054,7 @@ dependencies = [ [[package]] name = "zenoh-transport" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feature_cleanup2#b358102888e43ab6a1f6e411aee20156b9ffbf4f" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#fa02cf0640a9a3c26ed00bc0c052ba3cc5d42060" dependencies = [ "async-executor", "async-global-executor", @@ -3086,12 +3085,11 @@ dependencies = [ [[package]] name = "zenoh-util" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feature_cleanup2#b358102888e43ab6a1f6e411aee20156b9ffbf4f" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#fa02cf0640a9a3c26ed00bc0c052ba3cc5d42060" dependencies = [ "async-std", "async-trait", "clap", - "const_format", "flume", "futures", "hex", diff --git a/Cargo.toml b/Cargo.toml index b497ee0f..16798cb2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -52,8 +52,8 @@ pyo3 = { version = "0.18.1", features = ["extension-module", "abi3-py37"] } serde_json = "1.0.94" uhlc = "0.6.0" validated_struct = "2.1.0" -zenoh = { git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "feature_cleanup2", features = [ +zenoh = { git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "master", features = [ "unstable", ], default-features = false } -zenoh-buffers = { git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "feature_cleanup2" } -zenoh-core = { git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "feature_cleanup2" } +zenoh-buffers = { git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "master" } +zenoh-core = { git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "master" }