From 992b94eef3e48242a6df24517b7eb8f1efeb6351 Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla.c.maki@gmail.com>
Date: Fri, 18 Nov 2022 17:06:33 -0800
Subject: [PATCH] Rebased to main

---
 crates/collab/src/integration_tests.rs    | 4 ++--
 crates/collab/src/main.rs                 | 2 +-
 crates/editor/src/items.rs                | 4 ++--
 crates/editor/src/persistence.rs          | 2 +-
 crates/sqlez/src/migrations.rs            | 2 +-
 crates/terminal/src/terminal.rs           | 2 --
 crates/workspace/src/persistence/model.rs | 4 +---
 crates/workspace/src/workspace.rs         | 4 ++--
 8 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/crates/collab/src/integration_tests.rs b/crates/collab/src/integration_tests.rs
index e1b242713f..386ccfbbff 100644
--- a/crates/collab/src/integration_tests.rs
+++ b/crates/collab/src/integration_tests.rs
@@ -1,6 +1,6 @@
 use crate::{
-    db::{NewUserParams, ProjectId, TestDb, UserId},
-    rpc::{Executor, Server, Store},
+    db::{NewUserParams, ProjectId, SqliteTestDb as TestDb, UserId},
+    rpc::{Executor, Server},
     AppState,
 };
 
diff --git a/crates/collab/src/main.rs b/crates/collab/src/main.rs
index d26ea1a0fa..dc98a2ee68 100644
--- a/crates/collab/src/main.rs
+++ b/crates/collab/src/main.rs
@@ -9,11 +9,11 @@ mod db_tests;
 #[cfg(test)]
 mod integration_tests;
 
-use crate::db::{Db, PostgresDb};
 use crate::rpc::ResultExt as _;
 use anyhow::anyhow;
 use axum::{routing::get, Router};
 use collab::{Error, Result};
+use db::DefaultDb as Db;
 use serde::Deserialize;
 use std::{
     env::args,
diff --git a/crates/editor/src/items.rs b/crates/editor/src/items.rs
index 60ac8d5278..5d900cd942 100644
--- a/crates/editor/src/items.rs
+++ b/crates/editor/src/items.rs
@@ -1,7 +1,7 @@
 use crate::{
     display_map::ToDisplayPoint, link_go_to_definition::hide_link_definition,
-    movement::surrounding_word, Anchor, Autoscroll, Editor, EditorMode, Event, ExcerptId,
-    MultiBuffer, MultiBufferSnapshot, NavigationData, ToPoint as _, FORMAT_TIMEOUT,
+    movement::surrounding_word, Anchor, Autoscroll, Editor, Event, ExcerptId, MultiBuffer,
+    MultiBufferSnapshot, NavigationData, ToPoint as _, FORMAT_TIMEOUT,
 };
 use anyhow::{anyhow, Context, Result};
 use futures::FutureExt;
diff --git a/crates/editor/src/persistence.rs b/crates/editor/src/persistence.rs
index 4b39f94638..acac2eff4c 100644
--- a/crates/editor/src/persistence.rs
+++ b/crates/editor/src/persistence.rs
@@ -24,7 +24,7 @@ impl Domain for Editor {
 }
 
 impl EditorDb {
-    fn get_path(_item_id: ItemId, _workspace_id: WorktreeId) -> PathBuf {
+    fn _get_path(_item_id: ItemId, _workspace_id: WorktreeId) -> PathBuf {
         unimplemented!();
     }
 }
diff --git a/crates/sqlez/src/migrations.rs b/crates/sqlez/src/migrations.rs
index d77d54095b..23af04bbf4 100644
--- a/crates/sqlez/src/migrations.rs
+++ b/crates/sqlez/src/migrations.rs
@@ -58,7 +58,7 @@ impl Connection {
 mod test {
     use indoc::indoc;
 
-    use crate::{connection::Connection, thread_safe_connection::ThreadSafeConnection};
+    use crate::connection::Connection;
 
     #[test]
     fn test_migrations_are_added_to_table() {
diff --git a/crates/terminal/src/terminal.rs b/crates/terminal/src/terminal.rs
index 66a64903d3..7e469e19fe 100644
--- a/crates/terminal/src/terminal.rs
+++ b/crates/terminal/src/terminal.rs
@@ -34,9 +34,7 @@ use mappings::mouse::{
 
 use procinfo::LocalProcessInfo;
 use settings::{AlternateScroll, Settings, Shell, TerminalBlink};
-use terminal_container_view::TerminalContainer;
 use util::ResultExt;
-use workspace::register_deserializable_item;
 
 use std::{
     cmp::min,
diff --git a/crates/workspace/src/persistence/model.rs b/crates/workspace/src/persistence/model.rs
index 9eca121c21..0d4aade867 100644
--- a/crates/workspace/src/persistence/model.rs
+++ b/crates/workspace/src/persistence/model.rs
@@ -16,9 +16,7 @@ use sqlez::{
 };
 use util::ResultExt;
 
-use crate::{
-    dock::DockPosition, item::ItemHandle, ItemDeserializers, Member, Pane, PaneAxis, Workspace,
-};
+use crate::{dock::DockPosition, ItemDeserializers, Member, Pane, PaneAxis, Workspace};
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct WorkspaceId(Arc<Vec<PathBuf>>);
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index fbe21be81c..66fdd19c70 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -677,7 +677,7 @@ impl Workspace {
         cx: &mut MutableAppContext,
     ) -> Task<(
         ViewHandle<Workspace>,
-        Vec<Option<Result<Box<dyn ItemHandle>, Arc<anyhow::Error>>>>,
+        Vec<Option<Result<Box<dyn ItemHandle>, anyhow::Error>>>,
     )> {
         let project_handle = Project::local(
             app_state.client.clone(),
@@ -740,7 +740,7 @@ impl Workspace {
                                 Some(
                                     workspace
                                         .update(&mut cx, |workspace, cx| {
-                                            workspace.open_path(project_path, true, cx)
+                                            workspace.open_path(project_path, None, true, cx)
                                         })
                                         .await,
                                 )