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

app/src/integration_testing/window/assertion.rs

@@ -1,9 +1,6 @@
-use galaxyui::{
-    async_assert_eq,
-    integration::{AssertionCallback, AssertionOutcome, StepData},
-    windowing::WindowManager,
-    SingletonEntity,
-};
+use galaxyui::integration::{AssertionCallback, AssertionOutcome, StepData};
+use galaxyui::windowing::WindowManager;
+use galaxyui::{async_assert_eq, SingletonEntity};
 
 /// Saves the active window id with the given step data key.
 pub fn save_active_window_id<K>(window_key: K) -> AssertionCallback

app/src/integration_testing/window/step.rs

@@ -1,8 +1,8 @@
-use galaxyui::{
-    async_assert_eq, integration::TestStep, platform::TerminationMode, windowing::WindowManager,
-    SingletonEntity,
-};
 use pathfinder_geometry::rect::RectF;
+use galaxyui::integration::TestStep;
+use galaxyui::platform::TerminationMode;
+use galaxyui::windowing::WindowManager;
+use galaxyui::{async_assert_eq, SingletonEntity};
 
 use crate::integration_testing::step::new_step_with_default_assertions;