Checkpoint

crates/storybook2/src/assets.rs

@@ -1,7 +1,7 @@
 use std::borrow::Cow;
 
 use anyhow::{anyhow, Result};
-use gpui3::{AssetSource, SharedString};
+use gpui2::{AssetSource, SharedString};
 use rust_embed::RustEmbed;
 
 #[derive(RustEmbed)]

crates/storybook2/src/stories/focus.rs

@@ -1,5 +1,5 @@
 use crate::themes::rose_pine;
-use gpui3::{
+use gpui2::{
     div, view, Context, Focusable, KeyBinding, ParentElement, StatelessInteractive, Styled, View,
     WindowContext,
 };

crates/storybook2/src/stories/kitchen_sink.rs

@@ -1,4 +1,4 @@
-use gpui3::{view, Context, View};
+use gpui2::{view, Context, View};
 use strum::IntoEnumIterator;
 use ui::prelude::*;
 

crates/storybook2/src/stories/scroll.rs

@@ -1,5 +1,5 @@
 use crate::themes::rose_pine;
-use gpui3::{
+use gpui2::{
     div, px, view, Context, Element, ParentElement, SharedString, Styled, View, WindowContext,
 };
 use ui::ElementExt;

crates/storybook2/src/stories/text.rs

@@ -1,4 +1,4 @@
-use gpui3::{div, view, white, Context, ParentElement, Styled, View, WindowContext};
+use gpui2::{div, view, white, Context, ParentElement, Styled, View, WindowContext};
 
 pub struct TextStory {
     text: View<()>,

crates/storybook2/src/stories/z_index.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use gpui3::{px, rgb, Div, Hsla};
+use gpui2::{px, rgb, Div, Hsla};
 use ui::prelude::*;
 
 use crate::story::Story;

crates/storybook2/src/story_selector.rs

@@ -5,7 +5,7 @@ use crate::stories::*;
 use anyhow::anyhow;
 use clap::builder::PossibleValue;
 use clap::ValueEnum;
-use gpui3::{view, AnyView, Context};
+use gpui2::{view, AnyView, Context};
 use strum::{EnumIter, EnumString, IntoEnumIterator};
 use ui::prelude::*;
 

crates/storybook2/src/storybook2.rs

@@ -9,7 +9,7 @@ mod themes;
 use std::sync::Arc;
 
 use clap::Parser;
-use gpui3::{
+use gpui2::{
     div, px, size, view, AnyView, BorrowAppContext, Bounds, Context, Element, ViewContext,
     WindowBounds, WindowOptions,
 };
@@ -53,7 +53,7 @@ fn main() {
     let theme = themes::load_theme(theme_name).unwrap();
 
     let asset_source = Arc::new(Assets);
-    gpui3::App::production(asset_source).run(move |cx| {
+    gpui2::App::production(asset_source).run(move |cx| {
         let selector =
             story_selector.unwrap_or(StorySelector::Component(ComponentStory::Workspace));
 

crates/storybook2/src/themes.rs

@@ -3,7 +3,7 @@ mod rose_pine;
 pub use rose_pine::*;
 
 use anyhow::{Context, Result};
-use gpui3::serde_json;
+use gpui2::serde_json;
 use serde::Deserialize;
 use ui::Theme;
 

crates/storybook2/src/themes/rose_pine.rs

@@ -1,4 +1,4 @@
-use gpui3::serde_json::{self, json};
+use gpui2::serde_json::{self, json};
 use ui::Theme;
 
 pub fn rose_pine() -> Theme {