Reformat code

Author: Hugo Laloge

commons/zenoh-util/src/net/mod.rs

@@ -11,12 +11,15 @@
 // Contributors:
 //   ZettaScale Zenoh Team, <[email protected]>
 //
+use std::{
+    net::{IpAddr, Ipv6Addr},
+    sync::RwLock,
+};
+
 #[cfg(unix)]
 use lazy_static::lazy_static;
 #[cfg(unix)]
 use pnet_datalink::NetworkInterface;
-use std::net::{IpAddr, Ipv6Addr};
-use std::sync::RwLock;
 use tokio::net::{TcpSocket, UdpSocket};
 use zenoh_core::{zconfigurable, zread, zwrite};
 #[cfg(unix)]

zenoh/src/api/scouting.rs

@@ -19,13 +19,12 @@ use zenoh_protocol::core::WhatAmIMatcher;
 use zenoh_result::ZResult;
 use zenoh_task::TerminatableTask;
 
-use crate::net::runtime::Scouting;
 use crate::{
     api::{
         builders::scouting::ScoutBuilder,
         handlers::{Callback, DefaultHandler},
     },
-    net::runtime::{orchestrator::Loop, Runtime},
+    net::runtime::{orchestrator::Loop, Runtime, Scouting},
     Config,
 };
 

zenoh/src/net/runtime/mod.rs

@@ -23,39 +23,27 @@ mod netlink;
 pub mod orchestrator;
 mod scouting;
 
-use self::orchestrator::StartConditions;
-use super::{primitives::DeMux, routing, routing::router::Router};
-#[cfg(feature = "plugins")]
-use crate::api::loader::{load_plugins, start_plugins};
-#[cfg(feature = "plugins")]
-use crate::api::plugins::PluginsManager;
-#[cfg(feature = "internal")]
-use crate::session::CloseBuilder;
-use crate::{
-    api::{
-        builders::close::{Closeable, Closee},
-        config::{Config, Notifier},
-    },
-    GIT_VERSION, LONG_VERSION,
-};
-pub use adminspace::AdminSpace;
-use async_trait::async_trait;
-use futures::{stream::StreamExt, Future};
-use rtnetlink::packet_route::address::{AddressAttribute, AddressMessage};
-use rtnetlink::packet_route::RouteNetlinkMessage;
-pub use scouting::Scouting;
-use std::net::IpAddr;
 #[cfg(feature = "plugins")]
 use std::sync::{Mutex, MutexGuard};
-use std::time::Duration;
 use std::{
     any::Any,
     collections::HashSet,
+    net::IpAddr,
     sync::{
         atomic::{AtomicU32, Ordering},
         Arc, Weak,
     },
+    time::Duration,
 };
+
+pub use adminspace::AdminSpace;
+use async_trait::async_trait;
+use futures::{stream::StreamExt, Future};
+use rtnetlink::packet_route::{
+    address::{AddressAttribute, AddressMessage},
+    RouteNetlinkMessage,
+};
+pub use scouting::Scouting;
 use tokio::task::JoinHandle;
 use tokio_util::sync::CancellationToken;
 use uhlc::{HLCBuilder, HLC};
@@ -79,6 +67,22 @@ use zenoh_transport::{
 };
 use zenoh_util::net::update_iface_cache;
 
+use self::orchestrator::StartConditions;
+use super::{primitives::DeMux, routing, routing::router::Router};
+#[cfg(feature = "plugins")]
+use crate::api::loader::{load_plugins, start_plugins};
+#[cfg(feature = "plugins")]
+use crate::api::plugins::PluginsManager;
+#[cfg(feature = "internal")]
+use crate::session::CloseBuilder;
+use crate::{
+    api::{
+        builders::close::{Closeable, Closee},
+        config::{Config, Notifier},
+    },
+    GIT_VERSION, LONG_VERSION,
+};
+
 #[cfg(unix)]
 const NETLINK_TIMEOUT: Duration = Duration::from_millis(500);
 

zenoh/src/net/runtime/netlink.rs

@@ -1,10 +1,15 @@
+use std::{
+    io,
+    pin::Pin,
+    task::{Context, Poll},
+};
+
 use futures::{channel::mpsc::UnboundedReceiver, Stream, StreamExt};
-use rtnetlink::packet_core::NetlinkPayload;
-use rtnetlink::sys::AsyncSocket;
-use rtnetlink::{packet_core::NetlinkMessage, packet_route::RouteNetlinkMessage, sys::SocketAddr};
-use std::io;
-use std::pin::Pin;
-use std::task::{Context, Poll};
+use rtnetlink::{
+    packet_core::{NetlinkMessage, NetlinkPayload},
+    packet_route::RouteNetlinkMessage,
+    sys::{AsyncSocket, SocketAddr},
+};
 
 const RTNLGRP_IPV4_IFADDR: u32 = 5;
 

zenoh/src/net/runtime/orchestrator.rs

@@ -33,8 +33,7 @@ use zenoh_protocol::core::{
 use zenoh_result::{bail, zerror, ZResult};
 
 use super::{Runtime, RuntimeSession};
-use crate::net::common::AutoConnect;
-use crate::net::runtime::scouting::Scouting;
+use crate::net::{common::AutoConnect, runtime::scouting::Scouting};
 
 pub enum Loop {
     Continue,

zenoh/src/net/runtime/scouting.rs

@@ -1,26 +1,27 @@
-use futures::lock::Mutex;
-use futures::FutureExt;
-use std::future::Future;
-use std::io::ErrorKind;
-use std::net::{IpAddr, SocketAddr};
-use std::sync::Arc;
-use std::time::Duration;
-use tokio::net::UdpSocket;
-use tokio::sync::RwLock;
-use tokio::task::JoinHandle;
+use std::{
+    future::Future,
+    io::ErrorKind,
+    net::{IpAddr, SocketAddr},
+    sync::Arc,
+    time::Duration,
+};
+
+use futures::{lock::Mutex, FutureExt};
+use tokio::{net::UdpSocket, sync::RwLock, task::JoinHandle};
 use tokio_util::sync::CancellationToken;
 use zenoh_buffers::{
     reader::{DidntRead, HasReader},
     writer::HasWriter,
 };
 use zenoh_codec::{RCodec, WCodec, Zenoh080};
-use zenoh_protocol::core::{Locator, WhatAmI, WhatAmIMatcher, ZenohIdProto};
-use zenoh_protocol::scouting::{HelloProto, Scout, ScoutingBody, ScoutingMessage};
+use zenoh_protocol::{
+    core::{Locator, WhatAmI, WhatAmIMatcher, ZenohIdProto},
+    scouting::{HelloProto, Scout, ScoutingBody, ScoutingMessage},
+};
 use zenoh_result::ZResult;
 
 use super::Runtime;
-use crate::net::common::AutoConnect;
-use crate::net::runtime::orchestrator::Loop;
+use crate::net::{common::AutoConnect, runtime::orchestrator::Loop};
 
 const RCV_BUF_SIZE: usize = u16::MAX as usize;
 const SCOUT_INITIAL_PERIOD: Duration = Duration::from_millis(1_000);