first pass of merging in warp (doesn't build)

app/src/integration_testing/cloud_object/assertion.rs

@@ -1,9 +1,9 @@
-use galaxyui::{async_assert, integration::AssertionCallback};
+use galaxyui::async_assert;
+use galaxyui::integration::AssertionCallback;
 
-use crate::{
-    cloud_object::{model::persistence::CloudModel, CloudModelType, GenericCloudObject, Revision},
-    server::ids::{HashableId, ServerId, SyncId, ToServerId},
-};
+use crate::cloud_object::model::persistence::CloudModel;
+use crate::cloud_object::{CloudModelType, GenericCloudObject, Revision};
+use crate::server::ids::{HashableId, ServerId, SyncId, ToServerId};
 
 /// Asserts metadata exists for the object with the given key and that the revision in that
 /// metadata matches the given expected revision.
@@ -29,7 +29,7 @@ where
         async_assert!(
             revision
                 == Revision::from_unix_timestamp_micros(expected_revision)
-                    .expect("revison should parse"),
+                    .expect("revision should parse"),
             "Expected revision to be:{expected_revision:?}\nBut got:\n{revision:?}"
         )
     })

app/src/integration_testing/cloud_object/mod.rs

@@ -1,16 +1,17 @@
 mod assertion;
 
-pub use assertion::*;
-use futures::{future::join_all, FutureExt};
-use galaxyui::{App, SingletonEntity};
-use itertools::Itertools;
 use std::future::Future;
 use std::pin::Pin;
 
-use crate::{
-    cloud_object::{model::persistence::CloudModel, Space},
-    server::cloud_objects::update_manager::UpdateManager,
-};
+pub use assertion::*;
+use futures::future::join_all;
+use futures::FutureExt;
+use itertools::Itertools;
+use galaxyui::{App, SingletonEntity};
+
+use crate::cloud_object::model::persistence::CloudModel;
+use crate::cloud_object::Space;
+use crate::server::cloud_objects::update_manager::UpdateManager;
 
 /// Clears the cloud model of all non-welcome objects in the user's personal space.
 /// Returns a future that resolves when the cloud model is cleared.