Remove the 2s from source code

crates/ai2/Cargo.toml

@@ -12,9 +12,9 @@ doctest = false
 test-support = []
 
 [dependencies]
-gpui2 = { path = "../gpui2" }
+gpui = { package = "gpui2", path = "../gpui2" }
 util = { path = "../util" }
-language2 = { path = "../language2" }
+language = { package = "language2", path = "../language2" }
 async-trait.workspace = true
 anyhow.workspace = true
 futures.workspace = true
@@ -35,4 +35,4 @@ rusqlite = { version = "0.29.0", features = ["blob", "array", "modern_sqlite"] }
 bincode = "1.3.3"
 
 [dev-dependencies]
-gpui2 = { path = "../gpui2", features = ["test-support"] }
+gpui = { package = "gpui2", path = "../gpui2", features = ["test-support"] }

crates/ai2/src/auth.rs

@@ -1,4 +1,4 @@
-use gpui2::AppContext;
+use gpui::AppContext;
 
 #[derive(Clone, Debug)]
 pub enum ProviderCredential {

crates/ai2/src/embedding.rs

@@ -81,7 +81,7 @@ mod tests {
     use super::*;
     use rand::prelude::*;
 
-    #[gpui2::test]
+    #[gpui::test]
     fn test_similarity(mut rng: StdRng) {
         assert_eq!(
             Embedding::from(vec![1., 0., 0., 0., 0.])

crates/ai2/src/prompts/base.rs

@@ -2,7 +2,7 @@ use std::cmp::Reverse;
 use std::ops::Range;
 use std::sync::Arc;
 
-use language2::BufferSnapshot;
+use language::BufferSnapshot;
 use util::ResultExt;
 
 use crate::models::LanguageModel;

crates/ai2/src/prompts/file_context.rs

@@ -1,6 +1,6 @@
 use anyhow::anyhow;
-use language2::BufferSnapshot;
-use language2::ToOffset;
+use language::BufferSnapshot;
+use language::ToOffset;
 
 use crate::models::LanguageModel;
 use crate::models::TruncationDirection;

crates/ai2/src/prompts/repository_context.rs

@@ -2,8 +2,8 @@ use crate::prompts::base::{PromptArguments, PromptTemplate};
 use std::fmt::Write;
 use std::{ops::Range, path::PathBuf};
 
-use gpui2::{AsyncAppContext, Model};
-use language2::{Anchor, Buffer};
+use gpui::{AsyncAppContext, Model};
+use language::{Anchor, Buffer};
 
 #[derive(Clone)]
 pub struct PromptCodeSnippet {

crates/ai2/src/providers/open_ai/completion.rs

@@ -3,7 +3,7 @@ use futures::{
     future::BoxFuture, io::BufReader, stream::BoxStream, AsyncBufReadExt, AsyncReadExt, FutureExt,
     Stream, StreamExt,
 };
-use gpui2::{AppContext, BackgroundExecutor};
+use gpui::{AppContext, BackgroundExecutor};
 use isahc::{http::StatusCode, Request, RequestExt};
 use parking_lot::RwLock;
 use serde::{Deserialize, Serialize};

crates/ai2/src/providers/open_ai/embedding.rs

@@ -1,8 +1,8 @@
 use anyhow::{anyhow, Result};
 use async_trait::async_trait;
 use futures::AsyncReadExt;
-use gpui2::BackgroundExecutor;
-use gpui2::{serde_json, AppContext};
+use gpui::BackgroundExecutor;
+use gpui::{serde_json, AppContext};
 use isahc::http::StatusCode;
 use isahc::prelude::Configurable;
 use isahc::{AsyncBody, Response};

crates/ai2/src/test.rs

@@ -5,7 +5,7 @@ use std::{
 
 use async_trait::async_trait;
 use futures::{channel::mpsc, future::BoxFuture, stream::BoxStream, FutureExt, StreamExt};
-use gpui2::AppContext;
+use gpui::AppContext;
 use parking_lot::Mutex;
 
 use crate::{