From 2bee565881c7aeb11b7f1b6e55428a350036371a Mon Sep 17 00:00:00 2001 From: Michael Ilyin Date: Wed, 24 Jan 2024 18:36:00 +0100 Subject: [PATCH] switched to main --- Cargo.lock | 54 +++++++++++++++++++++++++++--------------------------- Cargo.toml | 14 +++++++------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6bee857..0fa0786 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3082,9 +3082,9 @@ dependencies = [ [[package]] name = "shlex" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook" @@ -4139,7 +4139,7 @@ dependencies = [ [[package]] name = "zenoh" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#279b3a862f628f7679edb0470e1c7557aeab54e7" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "async-global-executor", "async-std", @@ -4205,7 +4205,7 @@ dependencies = [ [[package]] name = "zenoh-buffers" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#279b3a862f628f7679edb0470e1c7557aeab54e7" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "zenoh-collections", ] @@ -4213,7 +4213,7 @@ dependencies = [ [[package]] name = "zenoh-codec" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#279b3a862f628f7679edb0470e1c7557aeab54e7" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "log", "serde", @@ -4225,12 +4225,12 @@ dependencies = [ [[package]] name = "zenoh-collections" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#279b3a862f628f7679edb0470e1c7557aeab54e7" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" [[package]] name = "zenoh-config" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#279b3a862f628f7679edb0470e1c7557aeab54e7" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "flume", "json5", @@ -4249,7 +4249,7 @@ dependencies = [ [[package]] name = "zenoh-core" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#279b3a862f628f7679edb0470e1c7557aeab54e7" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "async-std", "lazy_static", @@ -4259,7 +4259,7 @@ dependencies = [ [[package]] name = "zenoh-crypto" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#279b3a862f628f7679edb0470e1c7557aeab54e7" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "aes 0.8.3", "hmac 0.12.1", @@ -4272,7 +4272,7 @@ dependencies = [ [[package]] name = "zenoh-ext" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#279b3a862f628f7679edb0470e1c7557aeab54e7" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "async-std", "bincode", @@ -4292,7 +4292,7 @@ dependencies = [ [[package]] name = "zenoh-keyexpr" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#279b3a862f628f7679edb0470e1c7557aeab54e7" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "hashbrown 0.14.0", "keyed-set", @@ -4306,7 +4306,7 @@ dependencies = [ [[package]] name = "zenoh-link" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#279b3a862f628f7679edb0470e1c7557aeab54e7" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "async-std", "async-trait", @@ -4325,7 +4325,7 @@ dependencies = [ [[package]] name = "zenoh-link-commons" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#279b3a862f628f7679edb0470e1c7557aeab54e7" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "async-std", "async-trait", @@ -4342,7 +4342,7 @@ dependencies = [ [[package]] name = "zenoh-link-quic" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#279b3a862f628f7679edb0470e1c7557aeab54e7" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "async-rustls", "async-std", @@ -4368,7 +4368,7 @@ dependencies = [ [[package]] name = "zenoh-link-tcp" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#279b3a862f628f7679edb0470e1c7557aeab54e7" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "async-std", "async-trait", @@ -4384,7 +4384,7 @@ dependencies = [ [[package]] name = "zenoh-link-tls" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#279b3a862f628f7679edb0470e1c7557aeab54e7" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "async-rustls", "async-std", @@ -4409,7 +4409,7 @@ dependencies = [ [[package]] name = "zenoh-link-udp" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#279b3a862f628f7679edb0470e1c7557aeab54e7" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "async-std", "async-trait", @@ -4428,7 +4428,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixsock_stream" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#279b3a862f628f7679edb0470e1c7557aeab54e7" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "async-std", "async-trait", @@ -4446,7 +4446,7 @@ dependencies = [ [[package]] name = "zenoh-link-ws" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#279b3a862f628f7679edb0470e1c7557aeab54e7" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "async-std", "async-trait", @@ -4466,7 +4466,7 @@ dependencies = [ [[package]] name = "zenoh-macros" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#279b3a862f628f7679edb0470e1c7557aeab54e7" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "proc-macro2", "quote", @@ -4479,7 +4479,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-rest" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#279b3a862f628f7679edb0470e1c7557aeab54e7" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "anyhow", "async-std", @@ -4537,7 +4537,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-trait" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#279b3a862f628f7679edb0470e1c7557aeab54e7" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "const_format", "libloading", @@ -4553,7 +4553,7 @@ dependencies = [ [[package]] name = "zenoh-protocol" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#279b3a862f628f7679edb0470e1c7557aeab54e7" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "const_format", "hex", @@ -4569,7 +4569,7 @@ dependencies = [ [[package]] name = "zenoh-result" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#279b3a862f628f7679edb0470e1c7557aeab54e7" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "anyhow", ] @@ -4577,7 +4577,7 @@ dependencies = [ [[package]] name = "zenoh-sync" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#279b3a862f628f7679edb0470e1c7557aeab54e7" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "async-std", "event-listener 4.0.0", @@ -4592,7 +4592,7 @@ dependencies = [ [[package]] name = "zenoh-transport" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#279b3a862f628f7679edb0470e1c7557aeab54e7" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "async-executor", "async-global-executor", @@ -4623,7 +4623,7 @@ dependencies = [ [[package]] name = "zenoh-util" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#279b3a862f628f7679edb0470e1c7557aeab54e7" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "async-std", "async-trait", diff --git a/Cargo.toml b/Cargo.toml index 999f76d..2e1d39a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,17 +43,17 @@ regex = "1.7.1" rustc_version = "0.4" serde = "1.0.154" serde_json = "1.0.94" -zenoh = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "simplified_load_plugin", features = [ +zenoh = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "main", features = [ "unstable", ] } -zenoh-collections = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "simplified_load_plugin" } -zenoh-core = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "simplified_load_plugin" } -zenoh-ext = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "simplified_load_plugin", features = [ +zenoh-collections = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "main" } +zenoh-core = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "main" } +zenoh-ext = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "main", features = [ "unstable", ] } -zenoh-plugin-rest = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "simplified_load_plugin", default-features = false } -zenoh-plugin-trait = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "simplified_load_plugin", default-features = false } -zenoh-util = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "simplified_load_plugin", default-features = false } +zenoh-plugin-rest = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "main", default-features = false } +zenoh-plugin-trait = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "main", default-features = false } +zenoh-util = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "main", default-features = false } [profile.release] debug = false