format: rustfmt with new rules

1 files changed, 25 insertions, 72 deletions

diff --git a/crates/whirl_server/src/cmd/commands/property/create.rs b/crates/whirl_server/src/cmd/commands/property/create.rs
index 4d59521..c2afd59 100644
--- a/crates/whirl_server/src/cmd/commands/property/create.rs
+++ b/crates/whirl_server/src/cmd/commands/property/create.rs
@@ -3,28 +3,20 @@
 
 // TODO: of2m-ify?
 
-use whirl_config::Config;
-
-use crate::{
-  cmd::constants::Command,
-  net::{
-    constants::{
-      VAR_APPNAME,
-      VAR_CHANNEL,
-      VAR_ERROR,
-      VAR_EXTERNAL_HTTP_SERVER,
-      VAR_MAIL_DOMAIN,
-      VAR_PRIV,
-      VAR_PROTOCOL,
-      VAR_SCRIPT_SERVER,
-      VAR_SERIAL,
-      VAR_SERVERTYPE,
-      VAR_SMTP_SERVER,
-      VAR_UPDATETIME,
+use {
+  crate::{
+    cmd::constants::Command,
+    net::{
+      constants::{
+        VAR_APPNAME, VAR_CHANNEL, VAR_ERROR, VAR_EXTERNAL_HTTP_SERVER,
+        VAR_MAIL_DOMAIN, VAR_PRIV, VAR_PROTOCOL, VAR_SCRIPT_SERVER, VAR_SERIAL,
+        VAR_SERVERTYPE, VAR_SMTP_SERVER, VAR_UPDATETIME,
+      },
+      network_property::NetworkProperty,
+      property_list::PropertyList,
     },
-    network_property::NetworkProperty,
-    property_list::PropertyList,
   },
+  whirl_config::Config,
 };
 
 pub fn property_update_as_distributor() -> Vec<u8> {
@@ -45,14 +37,8 @@ pub fn property_update_as_distributor() -> Vec<u8> {
       prop_id: VAR_EXTERNAL_HTTP_SERVER,
       value:   "http://www-static.us.worlds.net".to_string(),
     },
-    NetworkProperty {
-      prop_id: VAR_SERVERTYPE,
-      value:   "1".to_string(),
-    },
-    NetworkProperty {
-      prop_id: VAR_PROTOCOL,
-      value:   "24".to_string(),
-    },
+    NetworkProperty { prop_id: VAR_SERVERTYPE, value: "1".to_string() },
+    NetworkProperty { prop_id: VAR_PROTOCOL, value: "24".to_string() },
     NetworkProperty {
       prop_id: VAR_APPNAME,
       value:   Config::get().whirlsplash.worldsmaster_username,
@@ -63,10 +49,7 @@ pub fn property_update_as_distributor() -> Vec<u8> {
 
 pub fn property_update_as_hub() -> Vec<u8> {
   PropertyList(vec![
-    NetworkProperty {
-      prop_id: VAR_UPDATETIME,
-      value:   "1000000".to_string(),
-    },
+    NetworkProperty { prop_id: VAR_UPDATETIME, value: "1000000".to_string() },
     NetworkProperty {
       prop_id: VAR_MAIL_DOMAIN,
       value:   "worlds3d.com".to_string(),
@@ -83,14 +66,8 @@ pub fn property_update_as_hub() -> Vec<u8> {
       prop_id: VAR_EXTERNAL_HTTP_SERVER,
       value:   "http://www-static.us.worlds.net".to_string(),
     },
-    NetworkProperty {
-      prop_id: VAR_SERVERTYPE,
-      value:   "3".to_string(),
-    },
-    NetworkProperty {
-      prop_id: VAR_PROTOCOL,
-      value:   "24".to_string(),
-    },
+    NetworkProperty { prop_id: VAR_SERVERTYPE, value: "3".to_string() },
+    NetworkProperty { prop_id: VAR_PROTOCOL, value: "24".to_string() },
     NetworkProperty {
       prop_id: VAR_APPNAME,
       value:   Config::get().whirlsplash.worldsmaster_username,
@@ -101,30 +78,18 @@ pub fn property_update_as_hub() -> Vec<u8> {
 
 pub fn property_request_as_distributor() -> Vec<u8> {
   PropertyList(vec![
-    NetworkProperty {
-      prop_id: VAR_ERROR,
-      value:   "0".to_string(),
-    },
+    NetworkProperty { prop_id: VAR_ERROR, value: "0".to_string() },
     NetworkProperty {
       prop_id: VAR_APPNAME,
       value:   Config::get().whirlsplash.worldsmaster_username,
     },
-    NetworkProperty {
-      prop_id: VAR_PROTOCOL,
-      value:   "24".to_string(),
-    },
-    NetworkProperty {
-      prop_id: VAR_SERVERTYPE,
-      value:   "1".to_string(),
-    },
+    NetworkProperty { prop_id: VAR_PROTOCOL, value: "24".to_string() },
+    NetworkProperty { prop_id: VAR_SERVERTYPE, value: "1".to_string() },
     NetworkProperty {
       prop_id: VAR_SERIAL,
       value:   "DWLV000000000000".to_string(),
     },
-    NetworkProperty {
-      prop_id: VAR_PRIV,
-      value:   "0".to_string(),
-    },
+    NetworkProperty { prop_id: VAR_PRIV, value: "0".to_string() },
     NetworkProperty {
       prop_id: VAR_CHANNEL,
       value:   "dimension-1".to_string(),
@@ -135,22 +100,10 @@ pub fn property_request_as_distributor() -> Vec<u8> {
 
 pub fn property_request_as_hub() -> Vec<u8> {
   PropertyList(vec![
-    NetworkProperty {
-      prop_id: VAR_ERROR,
-      value:   "0".to_string(),
-    },
-    NetworkProperty {
-      prop_id: VAR_SERVERTYPE,
-      value:   "3".to_string(),
-    },
-    NetworkProperty {
-      prop_id: VAR_UPDATETIME,
-      value:   "1000000".to_string(),
-    },
-    NetworkProperty {
-      prop_id: VAR_PROTOCOL,
-      value:   "24".to_string(),
-    },
+    NetworkProperty { prop_id: VAR_ERROR, value: "0".to_string() },
+    NetworkProperty { prop_id: VAR_SERVERTYPE, value: "3".to_string() },
+    NetworkProperty { prop_id: VAR_UPDATETIME, value: "1000000".to_string() },
+    NetworkProperty { prop_id: VAR_PROTOCOL, value: "24".to_string() },
   ])
   .as_bytes(Command::SessInit as i32, 0x01)
 }