From 296fc92721528dba16fd0d2e93444cb8f448d7ee Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Thu, 19 Oct 2023 23:47:32 +0200
Subject: [PATCH] Checkpoint

---
 crates/storybook2/src/stories/focus.rs    | 4 ++--
 crates/ui2/src/components/collab_panel.rs | 6 ++----
 crates/ui2/src/components/icon_button.rs  | 2 +-
 crates/ui2/src/elements/button.rs         | 2 +-
 crates/ui2/src/prelude.rs                 | 4 ++--
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/crates/storybook2/src/stories/focus.rs b/crates/storybook2/src/stories/focus.rs
index b10c75c1900df614df9d45d2a56b02d17d4bf932..0133a890bee611087a48f6352c1b1ce7c8f2c8da 100644
--- a/crates/storybook2/src/stories/focus.rs
+++ b/crates/storybook2/src/stories/focus.rs
@@ -1,8 +1,8 @@
 use std::any::Any;
 
 use gpui3::{
-    div, view, Action, Context, Focus, Interactive, KeyBinding, ParentElement, Styled, View,
-    WindowContext,
+    div, view, Action, Context, Focus, KeyBinding, ParentElement, StatelesslyInteractive, Styled,
+    View, WindowContext,
 };
 
 use crate::themes::rose_pine;
diff --git a/crates/ui2/src/components/collab_panel.rs b/crates/ui2/src/components/collab_panel.rs
index 8afc4256c482e125b89ebf5140a149bff7e96da4..bd743bfdd10493fcc8e13a7338292a7cd6c72e00 100644
--- a/crates/ui2/src/components/collab_panel.rs
+++ b/crates/ui2/src/components/collab_panel.rs
@@ -1,12 +1,10 @@
-use std::marker::PhantomData;
-
-use gpui3::{img, svg, SharedString};
-
 use crate::prelude::*;
 use crate::{
     static_collab_panel_channels, static_collab_panel_current_call, v_stack, Icon, List,
     ListHeader, ToggleState,
 };
+use gpui3::{img, svg, SharedString};
+use std::marker::PhantomData;
 
 #[derive(Element)]
 pub struct CollabPanel<S: 'static + Send + Sync + Clone> {
diff --git a/crates/ui2/src/components/icon_button.rs b/crates/ui2/src/components/icon_button.rs
index f71681e86408a3fffe8d186cdc0ed8a878b91af7..dd7e9457e15e5f00eead24f15ee37434edabd7a4 100644
--- a/crates/ui2/src/components/icon_button.rs
+++ b/crates/ui2/src/components/icon_button.rs
@@ -1,7 +1,7 @@
 use std::marker::PhantomData;
 use std::sync::Arc;
 
-use gpui3::{MouseButton, StatelesslyInteractive};
+use gpui3::MouseButton;
 
 use crate::{h_stack, prelude::*};
 use crate::{ClickHandler, Icon, IconColor, IconElement};
diff --git a/crates/ui2/src/elements/button.rs b/crates/ui2/src/elements/button.rs
index f077f2286f17d4d3e9f1c1646fb13e5ddb08a90b..7e474fb5af2403b954df72a46500959a2fb481bd 100644
--- a/crates/ui2/src/elements/button.rs
+++ b/crates/ui2/src/elements/button.rs
@@ -1,7 +1,7 @@
 use std::marker::PhantomData;
 use std::sync::Arc;
 
-use gpui3::{DefiniteLength, Hsla, MouseButton, StatelesslyInteractive, WindowContext};
+use gpui3::{DefiniteLength, Hsla, MouseButton, WindowContext};
 
 use crate::settings::user_settings;
 use crate::{h_stack, Icon, IconColor, IconElement, Label, LabelColor};
diff --git a/crates/ui2/src/prelude.rs b/crates/ui2/src/prelude.rs
index d61a5463c6ea8558bd57f5219654020a8da5fabb..456d6cefe15ad3db93ba59e5a0fe0bee69e67669 100644
--- a/crates/ui2/src/prelude.rs
+++ b/crates/ui2/src/prelude.rs
@@ -1,6 +1,6 @@
 pub use gpui3::{
-    div, Element, Hover, IntoAnyElement, ParentElement, ScrollState, SharedString,
-    StatefullyInteractive, Styled, ViewContext, WindowContext,
+    div, Element, IntoAnyElement, ParentElement, ScrollState, SharedString, StatefullyInteractive,
+    StatelesslyInteractive, Styled, ViewContext, WindowContext,
 };
 
 use crate::settings::user_settings;