Checkpoint

crates/ui2/src/components/assistant_panel.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use gpui3::{rems, AbsoluteLength};
+use gpui2::{rems, AbsoluteLength};
 
 use crate::prelude::*;
 use crate::{Icon, IconButton, Label, Panel, PanelSide};

crates/ui2/src/components/breadcrumb.rs

@@ -1,7 +1,7 @@
 use std::marker::PhantomData;
 use std::path::PathBuf;
 
-use gpui3::Div;
+use gpui2::Div;
 
 use crate::prelude::*;
 use crate::{h_stack, HighlightedText};

crates/ui2/src/components/buffer.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use gpui3::{Hsla, WindowContext};
+use gpui2::{Hsla, WindowContext};
 
 use crate::prelude::*;
 use crate::{h_stack, v_stack, Icon, IconElement};
@@ -238,7 +238,7 @@ pub use stories::*;
 
 #[cfg(feature = "stories")]
 mod stories {
-    use gpui3::rems;
+    use gpui2::rems;
 
     use crate::{
         empty_buffer_example, hello_world_rust_buffer_example,

crates/ui2/src/components/buffer_search.rs

@@ -1,4 +1,4 @@
-use gpui3::{view, Context, View};
+use gpui2::{view, Context, View};
 
 use crate::prelude::*;
 use crate::{h_stack, Icon, IconButton, IconColor, Input};

crates/ui2/src/components/collab_panel.rs

@@ -3,7 +3,7 @@ use crate::{
     static_collab_panel_channels, static_collab_panel_current_call, v_stack, Icon, List,
     ListHeader, ToggleState,
 };
-use gpui3::{img, svg, SharedString};
+use gpui2::{img, svg, SharedString};
 use std::marker::PhantomData;
 
 #[derive(Element)]

crates/ui2/src/components/editor_pane.rs

@@ -1,6 +1,6 @@
 use std::path::PathBuf;
 
-use gpui3::{view, Context, View};
+use gpui2::{view, Context, View};
 
 use crate::prelude::*;
 use crate::{

crates/ui2/src/components/icon_button.rs

@@ -1,7 +1,7 @@
 use std::marker::PhantomData;
 use std::sync::Arc;
 
-use gpui3::MouseButton;
+use gpui2::MouseButton;
 
 use crate::{h_stack, prelude::*};
 use crate::{ClickHandler, Icon, IconColor, IconElement};

crates/ui2/src/components/list.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use gpui3::{div, relative, Div};
+use gpui2::{div, relative, Div};
 
 use crate::settings::user_settings;
 use crate::{

crates/ui2/src/components/notification_toast.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use gpui3::rems;
+use gpui2::rems;
 
 use crate::{h_stack, prelude::*, Icon};
 

crates/ui2/src/components/palette.rs

@@ -152,7 +152,7 @@ impl<S: 'static + Send + Sync> PaletteItem<S> {
     }
 }
 
-use gpui3::ElementId;
+use gpui2::ElementId;
 #[cfg(feature = "stories")]
 pub use stories::*;
 

crates/ui2/src/components/panel.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use gpui3::{AbsoluteLength, AnyElement};
+use gpui2::{AbsoluteLength, AnyElement};
 use smallvec::SmallVec;
 
 use crate::prelude::*;

crates/ui2/src/components/panes.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use gpui3::{hsla, AnyElement, ElementId, Hsla, Length, Size};
+use gpui2::{hsla, AnyElement, ElementId, Hsla, Length, Size};
 use smallvec::SmallVec;
 
 use crate::prelude::*;

crates/ui2/src/components/project_panel.rs

@@ -58,7 +58,7 @@ impl<S: 'static + Send + Sync> ProjectPanel<S> {
     }
 }
 
-use gpui3::ElementId;
+use gpui2::ElementId;
 #[cfg(feature = "stories")]
 pub use stories::*;
 

crates/ui2/src/components/tab.rs

@@ -148,7 +148,7 @@ impl<S: 'static + Send + Sync + Clone> Tab<S> {
     }
 }
 
-use gpui3::ElementId;
+use gpui2::ElementId;
 #[cfg(feature = "stories")]
 pub use stories::*;
 

crates/ui2/src/components/tab_bar.rs

@@ -90,7 +90,7 @@ impl<S: 'static + Send + Sync + Clone> TabBar<S> {
     }
 }
 
-use gpui3::ElementId;
+use gpui2::ElementId;
 #[cfg(feature = "stories")]
 pub use stories::*;
 

crates/ui2/src/components/terminal.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use gpui3::{relative, rems, Size};
+use gpui2::{relative, rems, Size};
 
 use crate::prelude::*;
 use crate::{Icon, IconButton, Pane, Tab};

crates/ui2/src/components/title_bar.rs

@@ -1,7 +1,7 @@
 use std::sync::atomic::AtomicBool;
 use std::sync::Arc;
 
-use gpui3::{view, Context, View};
+use gpui2::{view, Context, View};
 
 use crate::prelude::*;
 use crate::settings::user_settings;

crates/ui2/src/components/toast.rs

@@ -1,4 +1,4 @@
-use gpui3::AnyElement;
+use gpui2::AnyElement;
 use smallvec::SmallVec;
 
 use crate::prelude::*;

crates/ui2/src/components/toolbar.rs

@@ -1,4 +1,4 @@
-use gpui3::AnyElement;
+use gpui2::AnyElement;
 use smallvec::SmallVec;
 
 use crate::prelude::*;

crates/ui2/src/components/workspace.rs

@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use chrono::DateTime;
-use gpui3::{px, relative, rems, view, Context, Size, View};
+use gpui2::{px, relative, rems, view, Context, Size, View};
 
 use crate::{prelude::*, NotificationsPanel};
 use crate::{