cargo fmt

eclipse-zenoh · Nov 28, 2023 · 6a4b366 · 6a4b366
1 parent d7b0ea8
commit 6a4b366
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 43 deletions.
diff --git a/commons/zenoh-util/src/lib.rs b/commons/zenoh-util/src/lib.rs
@@ -42,4 +42,3 @@ mod std_only;
 
 #[cfg(feature = "std")]
 pub use std_only::*;
-
diff --git a/zenoh-ext/src/lib.rs b/zenoh-ext/src/lib.rs
@@ -55,7 +55,5 @@ impl From<LivelinessSpace> for KeySpace {
 #[test]
 fn test_default_features() {
     // make sure that when inporting zenoh-ext with default features, no unwanted features are pulled from zenoh-core
-    assert_eq!(zenoh::FEATURES, concat!(
-        " zenoh/unstable",
-    ));      
-}
+    assert_eq!(zenoh::FEATURES, concat!(" zenoh/unstable",));
+}
diff --git a/zenoh/src/lib.rs b/zenoh/src/lib.rs
@@ -85,12 +85,12 @@ use handlers::DefaultHandler;
 use net::runtime::Runtime;
 use prelude::*;
 use scouting::ScoutBuilder;
-use zenoh_util::concat_enabled_features;
 use std::future::Ready;
 use zenoh_core::{AsyncResolve, Resolvable, SyncResolve};
 pub use zenoh_macros::{kedefine, keformat, kewrite};
 use zenoh_protocol::core::WhatAmIMatcher;
 use zenoh_result::{zerror, ZResult};
+use zenoh_util::concat_enabled_features;
 
 /// A zenoh error.
 pub use zenoh_result::Error;

diff --git a/zenohd/src/main.rs b/zenohd/src/main.rs
@@ -311,45 +311,51 @@ fn config_from_args(args: &ArgMatches) -> Config {
 #[test]
 #[cfg(feature = "default")]
 fn test_default_features() {
-    assert_eq!(zenoh::FEATURES, concat!(
-        " zenoh/auth_pubkey",
-        " zenoh/auth_usrpwd",
-        // " zenoh/complete_n",
-        // " zenoh/shared-memory",
-        // " zenoh/stats",
-        " zenoh/transport_multilink",
-        " zenoh/transport_quic",
-        // " zenoh/transport_serial",
-        // " zenoh/transport_unixpipe",
-        " zenoh/transport_tcp",
-        " zenoh/transport_tls",
-        " zenoh/transport_udp",
-        " zenoh/transport_unixsock-stream",
-        " zenoh/transport_ws",
-        " zenoh/unstable",
-        " zenoh/default",
-    ));      
+    assert_eq!(
+        zenoh::FEATURES,
+        concat!(
+            " zenoh/auth_pubkey",
+            " zenoh/auth_usrpwd",
+            // " zenoh/complete_n",
+            // " zenoh/shared-memory",
+            // " zenoh/stats",
+            " zenoh/transport_multilink",
+            " zenoh/transport_quic",
+            // " zenoh/transport_serial",
+            // " zenoh/transport_unixpipe",
+            " zenoh/transport_tcp",
+            " zenoh/transport_tls",
+            " zenoh/transport_udp",
+            " zenoh/transport_unixsock-stream",
+            " zenoh/transport_ws",
+            " zenoh/unstable",
+            " zenoh/default",
+        )
+    );
 }
 
 #[test]
 #[cfg(not(feature = "default"))]
 fn test_no_default_features() {
-    assert_eq!(zenoh::FEATURES, concat!(
-        // " zenoh/auth_pubkey",
-        // " zenoh/auth_usrpwd",
-        // " zenoh/complete_n",
-        // " zenoh/shared-memory",
-        // " zenoh/stats",
-        // " zenoh/transport_multilink",
-        // " zenoh/transport_quic",
-        // " zenoh/transport_serial",
-        // " zenoh/transport_unixpipe",
-        // " zenoh/transport_tcp",
-        // " zenoh/transport_tls",
-        // " zenoh/transport_udp",
-        // " zenoh/transport_unixsock-stream",
-        // " zenoh/transport_ws",
-        " zenoh/unstable",
-        // " zenoh/default",
-    ));      
-}
+    assert_eq!(
+        zenoh::FEATURES,
+        concat!(
+            // " zenoh/auth_pubkey",
+            // " zenoh/auth_usrpwd",
+            // " zenoh/complete_n",
+            // " zenoh/shared-memory",
+            // " zenoh/stats",
+            // " zenoh/transport_multilink",
+            // " zenoh/transport_quic",
+            // " zenoh/transport_serial",
+            // " zenoh/transport_unixpipe",
+            // " zenoh/transport_tcp",
+            // " zenoh/transport_tls",
+            // " zenoh/transport_udp",
+            // " zenoh/transport_unixsock-stream",
+            // " zenoh/transport_ws",
+            " zenoh/unstable",
+            // " zenoh/default",
+        )
+    );
+}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -42,4 +42,3 @@ mod std_only;

		#[cfg(feature = "std")]
		pub use std_only::*;