chore: bump zenoh version

.github/workflows/ci.yml

@@ -44,8 +44,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,8 @@
+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]

zenoh-bridge-dds/src/main.rs

@@ -11,15 +11,18 @@
 // Contributors:
 //   ZettaScale Zenoh Team, <[email protected]>
 //
+use std::{
+    str::FromStr,
+    time::{Duration, SystemTime},
+};
+
 use async_liveliness_monitor::LivelinessMonitor;
 use clap::{App, Arg};
-use std::str::FromStr;
-use std::time::{Duration, SystemTime};
 use zenoh::{
     config::{Config, ModeDependentValue},
-    info::ZenohId,
     internal::{plugins::PluginsManager, runtime::RuntimeBuilder},
     prelude::*,
+    session::ZenohId,
 };
 use zenoh_plugin_dds::DDSPlugin;
 use zenoh_plugin_trait::Plugin;

zenoh-plugin-dds/src/config.rs

@@ -11,12 +11,10 @@
 // Contributors:
 //   ZettaScale Zenoh Team, <[email protected]>
 //
+use std::{env, fmt, time::Duration};
+
 use regex::Regex;
-use serde::de::Visitor;
-use serde::{de, Deserialize, Deserializer};
-use std::env;
-use std::fmt;
-use std::time::Duration;
+use serde::{de, de::Visitor, Deserialize, Deserializer};
 use zenoh::key_expr::OwnedKeyExpr;
 
 pub const DEFAULT_DOMAIN: u32 = 0;

zenoh-plugin-dds/src/dds_mgt.rs

@@ -11,28 +11,33 @@
 // Contributors:
 //   ZettaScale Zenoh Team, <[email protected]>
 //
+use std::{
+    collections::HashMap,
+    ffi::{CStr, CString},
+    fmt,
+    mem::MaybeUninit,
+    slice,
+    sync::Arc,
+    time::Duration,
+};
+
 use async_std::task;
-use cyclors::qos::{History, HistoryKind, Qos};
-use cyclors::*;
+use cyclors::{
+    qos::{History, HistoryKind, Qos},
+    *,
+};
 use flume::Sender;
 use serde::{Deserialize, Serialize, Serializer};
-use std::collections::HashMap;
-use std::ffi::{CStr, CString};
-use std::fmt;
-use std::mem::MaybeUninit;
-use std::slice;
-use std::sync::Arc;
-use std::time::Duration;
 use tracing::{debug, error, warn};
-#[cfg(feature = "dds_shm")]
-use zenoh::internal::buffers::{ZBuf, ZSlice};
 use zenoh::{
     bytes::ZBytes,
     key_expr::{KeyExpr, OwnedKeyExpr},
     prelude::*,
-    publisher::CongestionControl,
+    qos::CongestionControl,
     Session,
 };
+#[cfg(feature = "dds_shm")]
+use zenoh::{internal::buffers::ZBuf, internal::buffers::ZSlice};
 
 const MAX_SAMPLES: usize = 32;