chore: bump zenoh version

.github/workflows/ci.yml

@@ -50,8 +50,7 @@ jobs:
           rustup component add rustfmt clippy
 
       - name: Code format check
-        run: cargo fmt --check
-
+        run: cargo fmt --check -- --config "unstable_features=true,imports_granularity=Crate,group_imports=StdExternalCrate"
       - name: Clippy
         run: cargo clippy --all --examples -- -D warnings
 

.pre-commit-config.yaml

@@ -0,0 +1,17 @@
+repos:
+  - repo: local
+    hooks:
+      - id: fmt
+        name: fmt
+        entry: cargo fmt -- --config "unstable_features=true,imports_granularity=Crate,group_imports=StdExternalCrate"
+        language: system
+        types: [rust]
+  - repo: https://github.com/pycqa/isort
+    rev: 5.12.0
+    hooks:
+      - id: isort
+  - repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 24.4.2
+    hooks:
+      - id: black
+        args: [-C]

Cargo.toml

@@ -46,14 +46,14 @@ rocksdb = "0.22.0"
 serde_json = "1.0.114"
 tracing = "0.1"
 uhlc = "0.7.0"
-zenoh = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "dev/1.0.0", features = [
+zenoh = { git = "https://github.com/ZettaScaleLabs/zenoh", branch = "pubsub_query", features = [
  "unstable",
  "internal",
  "plugins"
 ] }
-zenoh_backend_traits = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "dev/1.0.0" }
-zenoh-plugin-trait = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "dev/1.0.0" }
-zenoh-codec = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "dev/1.0.0" }
+zenoh_backend_traits = { git = "https://github.com/ZettaScaleLabs/zenoh", branch = "pubsub_query" }
+zenoh-plugin-trait = { git = "https://github.com/ZettaScaleLabs/zenoh", branch = "pubsub_query" }
+zenoh-codec = { git = "https://github.com/ZettaScaleLabs/zenoh", branch = "pubsub_query" }
 
 [build-dependencies]
 rustc_version = "0.4.0"

src/lib.rs

@@ -12,24 +12,25 @@
 //   ZettaScale Zenoh Team, <[email protected]>
 //
 
+use std::{borrow::Cow, collections::HashMap, path::PathBuf, time::Duration};
+
 use async_std::sync::{Arc, Mutex};
 use async_trait::async_trait;
 use rocksdb::{ColumnFamilyDescriptor, Options, WriteBatch, DB};
-use std::borrow::Cow;
-use std::collections::HashMap;
-use std::path::PathBuf;
-use std::time::Duration;
 use tracing::{debug, error, trace, warn};
 use uhlc::NTP64;
-use zenoh::bytes::ZBytes;
-use zenoh::encoding::Encoding;
-use zenoh::internal::{bail, zenoh_home, zerror, Value};
-use zenoh::key_expr::OwnedKeyExpr;
-use zenoh::selector::Parameters;
-use zenoh::time::{new_timestamp, Timestamp};
-use zenoh::{try_init_log_from_env, Error, Result as ZResult};
-use zenoh_backend_traits::config::{StorageConfig, VolumeConfig};
-use zenoh_backend_traits::*;
+use zenoh::{
+    bytes::{Encoding, ZBytes},
+    internal::{bail, zenoh_home, zerror, Value},
+    key_expr::OwnedKeyExpr,
+    query::Parameters,
+    time::{new_timestamp, Timestamp},
+    try_init_log_from_env, Error, Result as ZResult,
+};
+use zenoh_backend_traits::{
+    config::{StorageConfig, VolumeConfig},
+    *,
+};
 use zenoh_plugin_trait::{plugin_long_version, plugin_version, Plugin};
 
 /// The environement variable used to configure the root of all storages managed by this RocksdbBackend.