fix(deps): bump rust toolchain to 1.70 for clap

The latest releases of clap(>4.3.24) and clap_lex(>0.5.0) require rust 1.70.

The resolver will pull [email protected] even if the requested version of clap is
=4.3.24.

Given that a library, which Zenoh-Flow is, cannot have a Cargo.lock; bumping the
rust-toolchain appears to be the easiest solution.

Signed-off-by: Julien Loudet <[email protected]>

Cargo.toml

@@ -33,6 +33,7 @@ readme = "README.md"
 repository = "https://github.com/eclipse-zenoh/zenoh-flow"
 
 [workspace.dependencies]
+clap = { version = "4.0" }
 zenoh = { version = "0.7.2-rc" }
 zenoh-sync = { version = "0.7.2-rc" }
 zenoh-util = { version = "0.7.2-rc" }

cargo-zenoh-flow/Cargo.toml

@@ -30,7 +30,7 @@ repository.workspace = true
 [dependencies]
 async-std = { version = "=1.12.0", features = ["attributes"] }
 cargo_toml = "0.13"
-clap = { version = "4.0", features = ["derive"] }
+clap = { workspace = true, features = ["derive"] }
 colored = "2"
 rand = { version = "0.8", optional =  true}
 serde = { version = "1.0", features = ["derive"] }

rust-toolchain

@@ -1 +1 @@
-1.69.0
+1.70.0

zenoh-flow-daemon/Cargo.toml

@@ -13,48 +13,46 @@
 #
 
 [package]
-name = "zenoh-flow-daemon"
-version.workspace = true
 authors.workspace = true
 categories.workspace = true
 description.workspace = true
 edition.workspace = true
 homepage.workspace = true
 license.workspace = true
+name = "zenoh-flow-daemon"
 readme.workspace = true
 repository.workspace = true
+version.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-zenoh-flow = {version = "0.6.0-dev", path = "../zenoh-flow"}
+async-ctrlc = { version = "1.2.0", features = ["stream"] }
+async-std = { version = "=1.12.0", features = ["attributes"] }
 async-trait = "0.1.50"
+clap = { workspace = true, features = ["derive"] }
 env_logger = "0.10.0"
-serde_derive = "1.0"
+flume = "0.10"
+futures = "0.3.5"
+git-version = "0.3"
+hostname = "0.3.1"
+log = "0.4"
+machine-uid = "0.2.0"
 serde = { version = "1.0", features = ["derive", "rc"] }
-serde_yaml = {version = "0.9"}
+serde_derive = "1.0"
 serde_json = "1.0"
-log = "0.4"
-async-std = { version = "=1.12.0", features = ["attributes"] }
-uuid = { version = "1.1", features = ["serde", "v4"] }
+serde_yaml = { version = "0.9" }
 uhlc = "0.5.1"
+uuid = { version = "1.1", features = ["serde", "v4"] }
 zenoh = { workspace = true }
+zenoh-flow = { version = "0.6.0-dev", path = "../zenoh-flow" }
 zenoh-util = { workspace = true }
 zrpc = { workspace = true }
 zrpc-macros = { workspace = true }
-clap = { version = "4.0", features = ["derive"] }
-hostname = "0.3.1"
-machine-uid = "0.2.0"
-git-version = "0.3"
-async-ctrlc ={version = "1.2.0", features = ["stream"]}
-futures = "0.3.5"
-flume = "0.10"
 
 [[bin]]
 name = "zenoh-flow-daemon"
 
-
-
 # Debian package configuration
 
 [package.metadata.deb]
@@ -103,8 +101,8 @@ section = "utils"
 conf-files = ["/etc/zenoh-flow/runtime.yaml"]
 
 [package.metadata.deb.systemd-units]
-unit-scripts = "resources/"
 unit-name = "zenoh-flow.service"
+unit-scripts = "resources/"
 
 # RPM package configuration
 
@@ -118,9 +116,9 @@ buildflags = ["--release"]
 zenoh-flow-daemon = { path = "/usr/bin/zenoh-flow-daemon" }
 
 [package.metadata.rpm.files]
+"../etc/extensions.d/placeholder" = { path = "/etc/zenoh-flow/extensions.d/placeholder", mode = "644" }
 "../etc/runtime.yaml" = { path = "/etc/zenoh-flow/runtime.yaml", mode = "644" }
-"../etc/zenoh-daemon.json" = { path = "/etc/zenoh-flow/zenoh-daemon.json", mode = "644" }
 "../etc/zenoh--zf-router.json" = { path = "/etc/zenoh-flow/zenoh-zf-router.json", mode = "644" }
-"../etc/extensions.d/placeholder" = { path = "/etc/zenoh-flow/extensions.d/placeholder", mode = "644" }
-"../var/placeholder" = { path = "/var/zenoh-flow/placeholder" }
+"../etc/zenoh-daemon.json" = { path = "/etc/zenoh-flow/zenoh-daemon.json", mode = "644" }
 "../resources/zenoh-flow.service" = { path = "/lib/systemd/system/zenoh-flow.service" }
+"../var/placeholder" = { path = "/var/zenoh-flow/placeholder" }

zenoh-flow-plugin/Cargo.toml

@@ -35,7 +35,7 @@ no_mangle = ["zenoh-plugin-trait/no_mangle"]
 [dependencies]
 async-std = "=1.12.0"
 async-trait = "0.1.57"
-clap = "4.0"
+clap = { workspace = true }
 env_logger = "0.10"
 flume = "0.10.14"
 futures = "0.3.24"

zenoh-flow/Cargo.toml

@@ -33,7 +33,7 @@ async-trait = "0.1.50"
 base64 = "0.20.0"
 bincode = { version = "1.3"}
 bytesize = "1.2.0"
-clap = { version = "4.0", features = ["derive"] }
+clap = { workspace = true, features = ["derive"] }
 const_format = "0.2.22"
 derive_more = "0.99.10"
 env_logger = "0.10"

zfctl/Cargo.toml

@@ -27,7 +27,7 @@ version.workspace = true
 [dependencies]
 async-std = { version = "=1.12.0", features = ["attributes"] }
 base64 = "0.20.0"
-clap = { version = "4.0", features = ["derive"] }
+clap = { workspace = true, features = ["derive"] }
 derive_more = "0.99.10"
 # FIXME: Remove when `std::env::home_dir` gets fixed.
 dirs = "4.0.0"