cargo fmt ugh

Author: david-crespo

nexus/db-model/src/lib.rs

@@ -215,8 +215,8 @@ pub use schema_versions::*;
 pub use semver_version::*;
 pub use service_kind::*;
 pub use silo::*;
-pub use silo_group::*;
 pub use silo_auth_settings::*;
+pub use silo_group::*;
 pub use silo_user::*;
 pub use silo_user_password_hash::*;
 pub use sled::*;

nexus/db-queries/src/db/datastore/mod.rs

@@ -90,8 +90,8 @@ mod rendezvous_debug_dataset;
 mod role;
 mod saga;
 mod silo;
-mod silo_group;
 mod silo_auth_settings;
+mod silo_group;
 mod silo_user;
 mod sled;
 mod sled_instance;

nexus/db-queries/src/db/datastore/silo.rs

@@ -66,8 +66,8 @@ impl DataStore {
         debug!(opctx.log, "attempting to create built-in silos");
 
         use nexus_db_schema::schema::silo;
-        use nexus_db_schema::schema::silo_quotas;
         use nexus_db_schema::schema::silo_auth_settings;
+        use nexus_db_schema::schema::silo_quotas;
         let conn = self.pool_connection_authorized(opctx).await?;
 
         let count = self
@@ -465,7 +465,8 @@ impl DataStore {
                 }
 
                 self.silo_quotas_delete(opctx, &conn, &authz_silo).await?;
-                self.silo_auth_settings_delete(opctx, &conn, &authz_silo).await?;
+                self.silo_auth_settings_delete(opctx, &conn, &authz_silo)
+                    .await?;
 
                 self.virtual_provisioning_collection_delete_on_connection(
                     &opctx.log, &conn, id,

nexus/src/app/device_auth.rs

@@ -108,8 +108,10 @@ impl super::Nexus {
                 .await?;
         assert_eq!(authz_user.id(), silo_user_id);
 
-        let silo_auth_settings =
-            self.db_datastore.silo_auth_settings_view(opctx, &authz_silo).await?;
+        let silo_auth_settings = self
+            .db_datastore
+            .silo_auth_settings_view(opctx, &authz_silo)
+            .await?;
 
         // Create an access token record.
         let token = DeviceAccessToken::new(

nexus/src/app/silo.rs

@@ -248,7 +248,11 @@ impl super::Nexus {
         let (.., authz_silo) =
             silo_lookup.lookup_for(authz::Action::Modify).await?;
         self.db_datastore
-            .silo_auth_settings_update(opctx, &authz_silo, settings.clone().into())
+            .silo_auth_settings_update(
+                opctx,
+                &authz_silo,
+                settings.clone().into(),
+            )
             .await
     }