Remove the 2s from source code

crates/db2/Cargo.toml

@@ -13,7 +13,7 @@ test-support = []
 
 [dependencies]
 collections = { path = "../collections" }
-gpui2 = { path = "../gpui2" }
+gpui = { package = "gpui2", path = "../gpui2" }
 sqlez = { path = "../sqlez" }
 sqlez_macros = { path = "../sqlez_macros" }
 util = { path = "../util" }
@@ -28,6 +28,6 @@ serde_derive.workspace = true
 smol.workspace = true
 
 [dev-dependencies]
-gpui2 = { path = "../gpui2", features = ["test-support"] }
+gpui = { package = "gpui2", path = "../gpui2", features = ["test-support"] }
 env_logger.workspace = true
 tempdir.workspace = true

crates/db2/src/db2.rs

@@ -4,7 +4,7 @@ pub mod query;
 // Re-export
 pub use anyhow;
 use anyhow::Context;
-use gpui2::AppContext;
+use gpui::AppContext;
 pub use indoc::indoc;
 pub use lazy_static;
 pub use smol;
@@ -201,7 +201,7 @@ mod tests {
     use crate::open_db;
 
     // Test bad migration panics
-    #[gpui2::test]
+    #[gpui::test]
     #[should_panic]
     async fn test_bad_migration_panics() {
         enum BadDB {}
@@ -225,8 +225,8 @@ mod tests {
     }
 
     /// Test that DB exists but corrupted (causing recreate)
-    #[gpui2::test]
-    async fn test_db_corruption(cx: &mut gpui2::TestAppContext) {
+    #[gpui::test]
+    async fn test_db_corruption(cx: &mut gpui::TestAppContext) {
         cx.executor().allow_parking();
 
         enum CorruptedDB {}
@@ -269,8 +269,8 @@ mod tests {
     }
 
     /// Test that DB exists but corrupted (causing recreate)
-    #[gpui2::test(iterations = 30)]
-    async fn test_simultaneous_db_corruption(cx: &mut gpui2::TestAppContext) {
+    #[gpui::test(iterations = 30)]
+    async fn test_simultaneous_db_corruption(cx: &mut gpui::TestAppContext) {
         cx.executor().allow_parking();
 
         enum CorruptedDB {}

crates/db2/src/kvp.rs

@@ -35,7 +35,7 @@ impl KeyValueStore {
 mod tests {
     use crate::kvp::KeyValueStore;
 
-    #[gpui2::test]
+    #[gpui::test]
     async fn test_kvp() {
         let db = KeyValueStore(crate::open_test_db("test_kvp").await);