cargo fmt

eclipse-zenoh · Jun 4, 2024 · 057a842 · 057a842
1 parent efaa910
commit 057a842
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 8 deletions.
diff --git a/commons/zenoh-config/src/lib.rs b/commons/zenoh-config/src/lib.rs
@@ -19,7 +19,14 @@ mod include;
 #[allow(unused_imports)]
 use std::convert::TryFrom; // This is a false positive from the rust analyser
 use std::{
-    any::Any, collections::HashSet, fmt, io::Read, net::SocketAddr, path::Path, str::FromStr, sync::{Arc, Mutex, MutexGuard, Weak}
+    any::Any,
+    collections::HashSet,
+    fmt,
+    io::Read,
+    net::SocketAddr,
+    path::Path,
+    str::FromStr,
+    sync::{Arc, Mutex, MutexGuard, Weak},
 };
 
 use include::recursive_include;
@@ -47,7 +54,7 @@ pub use connection_retry::*;
 
 /// The global unique id of a zenoh peer.
 #[derive(
-    Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize, Debug, Default
+    Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize, Debug, Default,
 )]
 #[repr(transparent)]
 pub struct ZenohId(zenoh_protocol::core::ZenohId);

diff --git a/zenoh/src/api/info.rs b/zenoh/src/api/info.rs
@@ -144,7 +144,7 @@ impl<'a> Wait for PeersZenohIdBuilder<'a> {
                     s.get_whatami()
                         .ok()
                         .and_then(|what| (what == WhatAmI::Peer).then_some(()))
-                        .and_then(|_| s.get_zid().map(|zid| zid.into()) .ok())
+                        .and_then(|_| s.get_zid().map(|zid| zid.into()).ok())
                 }),
         )
     }

diff --git a/zenoh/src/api/session.rs b/zenoh/src/api/session.rs
@@ -35,8 +35,7 @@ use zenoh_protocol::network::{declare::SubscriberId, ext};
 use zenoh_protocol::{
     core::{
         key_expr::{keyexpr, OwnedKeyExpr},
-        AtomicExprId, CongestionControl, EntityId, ExprId, Reliability, WireExpr,
-        EMPTY_EXPR_ID,
+        AtomicExprId, CongestionControl, EntityId, ExprId, Reliability, WireExpr, EMPTY_EXPR_ID,
     },
     network::{
         self,

diff --git a/zenoh/src/net/routing/hat/linkstate_peer/mod.rs b/zenoh/src/net/routing/hat/linkstate_peer/mod.rs
@@ -26,8 +26,8 @@ use std::{
 
 use zenoh_config::{unwrap_or_default, ModeDependent, WhatAmI, WhatAmIMatcher};
 use zenoh_protocol::{
-    core::ZenohId,
     common::ZExtBody,
+    core::ZenohId,
     network::{
         declare::{queryable::ext::QueryableInfoType, QueryableId, SubscriberId},
         interest::InterestId,

diff --git a/zenoh/src/net/routing/hat/mod.rs b/zenoh/src/net/routing/hat/mod.rs
@@ -22,8 +22,8 @@ use std::{any::Any, collections::HashMap, sync::Arc};
 use zenoh_buffers::ZBuf;
 use zenoh_config::{unwrap_or_default, Config, WhatAmI};
 use zenoh_protocol::{
-    core::ZenohId,
     core::WireExpr,
+    core::ZenohId,
     network::{
         declare::{
             queryable::ext::QueryableInfoType, subscriber::ext::SubscriberInfo, QueryableId,

diff --git a/zenoh/src/net/routing/hat/router/mod.rs b/zenoh/src/net/routing/hat/router/mod.rs
@@ -27,8 +27,8 @@ use std::{
 
 use zenoh_config::{unwrap_or_default, ModeDependent, WhatAmI, WhatAmIMatcher};
 use zenoh_protocol::{
-    core::ZenohId,
     common::ZExtBody,
+    core::ZenohId,
     network::{
         declare::{queryable::ext::QueryableInfoType, QueryableId, SubscriberId},
         interest::InterestId,