From c118f9aabd6b226f9373232fcecea130ec6fdeb3 Mon Sep 17 00:00:00 2001
From: Joseph Lyons <JosephTLyons@gmail.com>
Date: Mon, 23 Jan 2023 01:31:02 -0500
Subject: [PATCH] Fix new errors after merge

---
 Cargo.lock                             |  1 -
 crates/feedback/Cargo.toml             |  1 -
 crates/feedback/src/feedback_editor.rs | 20 ++++++++------------
 crates/workspace/src/workspace.rs      |  2 +-
 crates/zed/src/zed.rs                  |  3 +--
 5 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index be257b2425..f08a13902e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2040,7 +2040,6 @@ dependencies = [
  "search",
  "serde",
  "settings",
- "smallvec",
  "sysinfo",
  "theme",
  "tree-sitter-markdown",
diff --git a/crates/feedback/Cargo.toml b/crates/feedback/Cargo.toml
index ec5aa52a1a..ee6ec2f6ed 100644
--- a/crates/feedback/Cargo.toml
+++ b/crates/feedback/Cargo.toml
@@ -25,7 +25,6 @@ project = { path = "../project" }
 search = { path = "../search" }
 serde = { version = "1.0", features = ["derive", "rc"] }
 settings = { path = "../settings" }
-smallvec = { version = "1.6", features = ["union"] }
 sysinfo = "0.27.1"
 theme = { path = "../theme" }
 tree-sitter-markdown = { git = "https://github.com/MDeiml/tree-sitter-markdown", rev = "330ecab87a3e3a7211ac69bbadc19eabecdb1cca" }
diff --git a/crates/feedback/src/feedback_editor.rs b/crates/feedback/src/feedback_editor.rs
index 564ac76203..ca960a7c10 100644
--- a/crates/feedback/src/feedback_editor.rs
+++ b/crates/feedback/src/feedback_editor.rs
@@ -7,18 +7,18 @@ use futures::AsyncReadExt;
 use gpui::{
     actions,
     elements::{ChildView, Flex, Label, MouseEventHandler, ParentElement, Stack, Text},
-    serde_json, AnyViewHandle, CursorStyle, Element, ElementBox, Entity, ModelHandle, MouseButton,
-    MutableAppContext, PromptLevel, RenderContext, Task, View, ViewContext, ViewHandle,
+    serde_json, AnyViewHandle, AppContext, CursorStyle, Element, ElementBox, Entity, ModelHandle,
+    MouseButton, MutableAppContext, PromptLevel, RenderContext, Task, View, ViewContext,
+    ViewHandle,
 };
 use isahc::Request;
 use language::Buffer;
 use postage::prelude::Stream;
 
 use lazy_static::lazy_static;
-use project::{Project, ProjectEntryId, ProjectPath};
+use project::Project;
 use serde::Serialize;
 use settings::Settings;
-use smallvec::SmallVec;
 use workspace::{
     item::{Item, ItemHandle},
     searchable::{SearchableItem, SearchableItemHandle},
@@ -345,18 +345,14 @@ impl Item for FeedbackEditor {
             .boxed()
     }
 
+    fn for_each_project_item(&self, cx: &AppContext, f: &mut dyn FnMut(usize, &dyn project::Item)) {
+        self.editor.for_each_project_item(cx, f)
+    }
+
     fn to_item_events(_: &Self::Event) -> Vec<workspace::item::ItemEvent> {
         Vec::new()
     }
 
-    fn project_path(&self, _: &gpui::AppContext) -> Option<ProjectPath> {
-        None
-    }
-
-    fn project_entry_ids(&self, _: &gpui::AppContext) -> SmallVec<[ProjectEntryId; 3]> {
-        SmallVec::new()
-    }
-
     fn is_singleton(&self, _: &gpui::AppContext) -> bool {
         true
     }
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index c1c90f2560..a212949511 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -99,7 +99,7 @@ actions!(
         ToggleRightSidebar,
         NewTerminal,
         NewSearch,
-        Feedback
+        Feedback,
         ShowNotif,
     ]
 );
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 3b1d65c349..57219cf7aa 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -20,8 +20,7 @@ use gpui::{
     },
     impl_actions,
     platform::{WindowBounds, WindowOptions},
-    AssetSource, AsyncAppContext, ClipboardItem, PromptLevel, TitlebarOptions, ViewContext,
-    WindowKind,
+    AssetSource, AsyncAppContext, PromptLevel, TitlebarOptions, ViewContext, WindowKind,
 };
 use language::Rope;
 use lazy_static::lazy_static;