chore: bump zenoh version (#109)

* chore: bump zenoh version

* chore: update branch

.github/workflows/ci.yml

@@ -40,8 +40,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-targets -- --deny 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]

src/client.rs

@@ -12,27 +12,29 @@
 //   ZettaScale Zenoh Team, <[email protected]>
 //
 
-use std::collections::HashMap;
-use std::fmt;
+use std::{collections::HashMap, fmt};
 
-use crate::config::TlsClientConfig;
 use aws_config::Region;
-use aws_sdk_s3::config::Credentials;
-use aws_sdk_s3::operation::create_bucket::CreateBucketOutput;
-use aws_sdk_s3::operation::delete_object::DeleteObjectOutput;
-use aws_sdk_s3::operation::delete_objects::DeleteObjectsOutput;
-use aws_sdk_s3::operation::get_object::GetObjectOutput;
-use aws_sdk_s3::operation::head_object::HeadObjectOutput;
-use aws_sdk_s3::operation::put_object::PutObjectOutput;
-use aws_sdk_s3::primitives::ByteStream;
-use aws_sdk_s3::types::{
-    BucketLocationConstraint, CreateBucketConfiguration, Delete, Object, ObjectIdentifier,
+use aws_sdk_s3::{
+    config::Credentials,
+    operation::{
+        create_bucket::CreateBucketOutput, delete_object::DeleteObjectOutput,
+        delete_objects::DeleteObjectsOutput, get_object::GetObjectOutput,
+        head_object::HeadObjectOutput, put_object::PutObjectOutput,
+    },
+    primitives::ByteStream,
+    types::{
+        BucketLocationConstraint, CreateBucketConfiguration, Delete, Object, ObjectIdentifier,
+    },
+    Client,
 };
-use aws_sdk_s3::Client;
 use aws_smithy_runtime::client::http::hyper_014::HyperClientBuilder;
-use zenoh::internal::zerror;
-use zenoh::internal::Value;
-use zenoh::Result as ZResult;
+use zenoh::{
+    internal::{zerror, Value},
+    Result as ZResult,
+};
+
+use crate::config::TlsClientConfig;
 
 /// Client to communicate with the S3 storage.
 pub(crate) struct S3Client {

src/config.rs

@@ -12,18 +12,16 @@
 //   ZettaScale Zenoh Team, <[email protected]>
 //
 
-use async_rustls::rustls::{ClientConfig, OwnedTrustAnchor, RootCertStore};
+use std::{fs::File, io::BufReader};
 
+use async_rustls::rustls::{ClientConfig, OwnedTrustAnchor, RootCertStore};
 use aws_sdk_s3::config::Credentials;
 use hyper::client::HttpConnector;
 use hyper_rustls::HttpsConnector;
 use rustls_pki_types::CertificateDer;
 use serde_json::{Map, Value};
-use std::{fs::File, io::BufReader};
 use webpki::TrustAnchor;
-use zenoh::internal::zerror;
-use zenoh::key_expr::OwnedKeyExpr;
-use zenoh::Result as ZResult;
+use zenoh::{internal::zerror, key_expr::OwnedKeyExpr, Result as ZResult};
 use zenoh_backend_traits::config::{PrivacyGetResult, PrivacyTransparentGet, StorageConfig};
 
 // Properties used by the Backend
@@ -366,8 +364,7 @@ impl TlsClientConfig {
     }
 
     pub fn base64_decode(data: &str) -> ZResult<Vec<u8>> {
-        use base64::engine::general_purpose;
-        use base64::Engine;
+        use base64::{engine::general_purpose, Engine};
         Ok(general_purpose::STANDARD
             .decode(data)
             .map_err(|e| zerror!("Unable to perform base64 decoding: {e:?}"))?)

src/lib.rs

@@ -16,28 +16,26 @@ pub mod client;
 pub mod config;
 pub mod utils;
 
+use std::{collections::HashMap, str::FromStr, vec};
+
 use async_std::sync::Arc;
 use async_trait::async_trait;
 use client::S3Client;
 use config::{S3Config, TlsClientConfig, TLS_PROP};
-use futures::future::join_all;
-use futures::stream::FuturesUnordered;
+use futures::{future::join_all, stream::FuturesUnordered};
 #[cfg(feature = "dynamic_plugin")]
 use lazy_static::lazy_static;
-use std::collections::HashMap;
-use std::str::FromStr;
-use std::vec;
 #[cfg(feature = "dynamic_plugin")]
 use tokio::runtime::Runtime;
 use utils::S3Key;
-use zenoh::encoding::Encoding;
-use zenoh::internal::zerror;
-use zenoh::internal::Value;
-use zenoh::key_expr::OwnedKeyExpr;
-use zenoh::selector::Parameters;
-use zenoh::time::Timestamp;
-use zenoh::try_init_log_from_env;
-use zenoh::Result as ZResult;
+use zenoh::{
+    bytes::Encoding,
+    internal::{zerror, Value},
+    key_expr::OwnedKeyExpr,
+    query::Parameters,
+    time::Timestamp,
+    try_init_log_from_env, Result as ZResult,
+};
 use zenoh_backend_traits::{
     config::{StorageConfig, VolumeConfig},
     Capability, History, Persistence, Storage, StorageInsertionResult, StoredData, Volume,

src/utils.rs

@@ -13,8 +13,8 @@
 //
 use core::fmt;
 use std::convert::TryFrom;
-use zenoh::key_expr::OwnedKeyExpr;
-use zenoh::Result as ZResult;
+
+use zenoh::{key_expr::OwnedKeyExpr, Result as ZResult};
 
 pub struct S3Key<'a> {
     pub prefix: Option<&'a String>,