diff --git a/crates/storybook2/src/stories/focus.rs b/crates/storybook2/src/stories/focus.rs
index ff9a4da876a021a79b7ccb9a69c89d604122182d..a8794afdb86053c93d06c73f82cf0af7125deeeb 100644
--- a/crates/storybook2/src/stories/focus.rs
+++ b/crates/storybook2/src/stories/focus.rs
@@ -1,5 +1,5 @@
 use gpui::{
-    actions, div, prelude::*, FocusHandle, Focusable, KeyBinding, Div, Render, Stateful, View,
+    actions, div, prelude::*, Div, FocusHandle, Focusable, KeyBinding, Render, Stateful, View,
     WindowContext,
 };
 use theme2::ActiveTheme;
diff --git a/crates/storybook2/src/stories/picker.rs b/crates/storybook2/src/stories/picker.rs
index eb4a3b88ea5759db2fe007390923c6a7f5184f59..a3f9ef5eb82a018619c52f314c00d2578d4e9b7b 100644
--- a/crates/storybook2/src/stories/picker.rs
+++ b/crates/storybook2/src/stories/picker.rs
@@ -1,5 +1,5 @@
 use fuzzy::StringMatchCandidate;
-use gpui::{div, prelude::*, KeyBinding, Div, Render, Styled, Task, View, WindowContext};
+use gpui::{div, prelude::*, Div, KeyBinding, Render, Styled, Task, View, WindowContext};
 use picker::{Picker, PickerDelegate};
 use std::sync::Arc;
 use theme2::ActiveTheme;
diff --git a/crates/storybook2/src/stories/scroll.rs b/crates/storybook2/src/stories/scroll.rs
index c5549e56d0e21c1c4fd6cd9c682cc60b209651a2..f9530269d5cdcdd73de522263003c88bd2500290 100644
--- a/crates/storybook2/src/stories/scroll.rs
+++ b/crates/storybook2/src/stories/scroll.rs
@@ -1,6 +1,4 @@
-use gpui::{
-    div, prelude::*, px, Div, Render, SharedString, Stateful, Styled, View, WindowContext,
-};
+use gpui::{div, prelude::*, px, Div, Render, SharedString, Stateful, Styled, View, WindowContext};
 use theme2::ActiveTheme;
 
 pub struct ScrollStory;
diff --git a/crates/ui2/src/components/panel.rs b/crates/ui2/src/components/panel.rs
index e16f203599c49519ebfb546cd2a61e06828db672..d9fc50dd923cc00084f257387efcbb1705efa9f1 100644
--- a/crates/ui2/src/components/panel.rs
+++ b/crates/ui2/src/components/panel.rs
@@ -126,7 +126,7 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::{Label, Story};
-    use gpui::{InteractiveComponent, Div, Render};
+    use gpui::{Div, InteractiveComponent, Render};
 
     pub struct PanelStory;
 
diff --git a/crates/ui2/src/prelude.rs b/crates/ui2/src/prelude.rs
index f37b6123e3fadfd4536061c682c833e5a0ec2a0d..09ce43d91239a34f50990ddcb945ec74d2ce98b7 100644
--- a/crates/ui2/src/prelude.rs
+++ b/crates/ui2/src/prelude.rs
@@ -1,8 +1,8 @@
 use gpui::rems;
 use gpui::Rems;
 pub use gpui::{
-    div, Component, Element, ElementId, InteractiveComponent, ParentComponent, SharedString, Styled,
-    ViewContext, WindowContext,
+    div, Component, Element, ElementId, InteractiveComponent, ParentComponent, SharedString,
+    Styled, ViewContext, WindowContext,
 };
 
 pub use crate::elevation::*;
diff --git a/crates/workspace2/src/dock.rs b/crates/workspace2/src/dock.rs
index 7695cffa882df33ae4ca37efcbaf98823dc7d962..499fb0d673b3bb38bcb99c7d22c568e5337dab15 100644
--- a/crates/workspace2/src/dock.rs
+++ b/crates/workspace2/src/dock.rs
@@ -1,7 +1,7 @@
 use crate::{status_bar::StatusItemView, Axis, Workspace};
 use gpui::{
-    div, Action, AnyView, AppContext, Entity, EntityId, EventEmitter, Div, ParentComponent,
-    Render, Subscription, View, ViewContext, WeakView, WindowContext,
+    div, Action, AnyView, AppContext, Div, Entity, EntityId, EventEmitter, ParentComponent, Render,
+    Subscription, View, ViewContext, WeakView, WindowContext,
 };
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
diff --git a/crates/workspace2/src/modal_layer.rs b/crates/workspace2/src/modal_layer.rs
index 0703d0dc563205dd9ee97c3ea9ab484a624fd198..c9dddfdace6bb2bbfd8d70075cccd02c975ab930 100644
--- a/crates/workspace2/src/modal_layer.rs
+++ b/crates/workspace2/src/modal_layer.rs
@@ -1,5 +1,5 @@
 use gpui::{
-    div, prelude::*, px, AnyView, EventEmitter, FocusHandle, Div, Render, Subscription, View,
+    div, prelude::*, px, AnyView, Div, EventEmitter, FocusHandle, Render, Subscription, View,
     ViewContext, WindowContext,
 };
 use ui::{h_stack, v_stack};
diff --git a/crates/workspace2/src/notifications.rs b/crates/workspace2/src/notifications.rs
index a17399af5754c249db7967417b2b8d73c06255b9..7277cc6fc47b33bb93ada4d37c0a2a5c68550f57 100644
--- a/crates/workspace2/src/notifications.rs
+++ b/crates/workspace2/src/notifications.rs
@@ -165,7 +165,7 @@ impl Workspace {
 
 pub mod simple_message_notification {
     use super::{Notification, NotificationEvent};
-    use gpui::{AnyElement, AppContext, EventEmitter, Div, Render, TextStyle, ViewContext};
+    use gpui::{AnyElement, AppContext, Div, EventEmitter, Render, TextStyle, ViewContext};
     use serde::Deserialize;
     use std::{borrow::Cow, sync::Arc};
 
diff --git a/crates/workspace2/src/pane.rs b/crates/workspace2/src/pane.rs
index aeca6173428dbedfeedac4f3437d82ab11b6010e..de0784758394ecf0564e75218e18d2ae210c7de2 100644
--- a/crates/workspace2/src/pane.rs
+++ b/crates/workspace2/src/pane.rs
@@ -7,9 +7,9 @@ use crate::{
 use anyhow::Result;
 use collections::{HashMap, HashSet, VecDeque};
 use gpui::{
-    actions, prelude::*, register_action, AppContext, AsyncWindowContext, Component, EntityId,
-    EventEmitter, FocusHandle, Model, Div, PromptLevel, Render, Task, View, ViewContext,
-    VisualContext, WeakView, WindowContext,
+    actions, prelude::*, register_action, AppContext, AsyncWindowContext, Component, Div, EntityId,
+    EventEmitter, FocusHandle, Model, PromptLevel, Render, Task, View, ViewContext, VisualContext,
+    WeakView, WindowContext,
 };
 use parking_lot::Mutex;
 use project2::{Project, ProjectEntryId, ProjectPath};
diff --git a/crates/workspace2/src/status_bar.rs b/crates/workspace2/src/status_bar.rs
index 18c6bbf0798eb0af6159ecf7914737b5fc291769..5dccac243f47c0ec169c3bec9436d7c0a998b22f 100644
--- a/crates/workspace2/src/status_bar.rs
+++ b/crates/workspace2/src/status_bar.rs
@@ -2,8 +2,8 @@ use std::any::TypeId;
 
 use crate::{ItemHandle, Pane};
 use gpui::{
-    div, AnyView, Component, Div, ParentComponent, Render, Styled, Subscription, View,
-    ViewContext, WindowContext,
+    div, AnyView, Component, Div, ParentComponent, Render, Styled, Subscription, View, ViewContext,
+    WindowContext,
 };
 use theme2::ActiveTheme;
 use util::ResultExt;
diff --git a/crates/workspace2/src/workspace2.rs b/crates/workspace2/src/workspace2.rs
index b48e4aa27855dc0e20b132ca5a2fb08fad1af641..3e3312ac3a6c3e44192169d33d72df1842dc3a6a 100644
--- a/crates/workspace2/src/workspace2.rs
+++ b/crates/workspace2/src/workspace2.rs
@@ -37,10 +37,10 @@ use futures::{
 };
 use gpui::{
     actions, div, point, prelude::*, rems, size, Action, AnyModel, AnyView, AnyWeakView,
-    AppContext, AsyncAppContext, AsyncWindowContext, Bounds, Component, Entity, EntityId,
-    EventEmitter, FocusHandle, GlobalPixels, KeyContext, Model, ModelContext, Div,
-    ParentComponent, Point, Render, Size, Styled, Subscription, Task, View, ViewContext, WeakView,
-    WindowBounds, WindowContext, WindowHandle, WindowOptions,
+    AppContext, AsyncAppContext, AsyncWindowContext, Bounds, Component, Div, Entity, EntityId,
+    EventEmitter, FocusHandle, GlobalPixels, KeyContext, Model, ModelContext, ParentComponent,
+    Point, Render, Size, Styled, Subscription, Task, View, ViewContext, WeakView, WindowBounds,
+    WindowContext, WindowHandle, WindowOptions,
 };
 use item::{FollowableItem, FollowableItemHandle, Item, ItemHandle, ItemSettings, ProjectItem};
 use itertools::Itertools;