From 8d05ee91b3625db61d7fa29cc952c8a459e1be98 Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Fri, 26 Apr 2024 13:12:46 +0200
Subject: [PATCH] Fix up build and a bunch of warnings

---
 crates/editor/src/element.rs            |  4 ++--
 crates/multi_buffer/src/multi_buffer.rs |  1 -
 crates/project/src/task_inventory.rs    |  2 +-
 crates/task/src/lib.rs                  |  2 +-
 crates/task/src/static_source.rs        |  2 +-
 crates/task/src/task_template.rs        |  3 +--
 crates/tasks_ui/src/lib.rs              | 12 +++---------
 7 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 3708640ca8..aacbe6679f 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -1285,7 +1285,7 @@ impl EditorElement {
         scroll_pixel_position: gpui::Point<Pixels>,
         gutter_dimensions: &GutterDimensions,
         gutter_hitbox: &Hitbox,
-        cx: &mut ElementContext,
+        cx: &mut WindowContext,
     ) -> Vec<AnyElement> {
         test_lines
             .into_iter()
@@ -3070,7 +3070,7 @@ fn prepaint_gutter_button(
     gutter_dimensions: &GutterDimensions,
     scroll_pixel_position: gpui::Point<Pixels>,
     gutter_hitbox: &Hitbox,
-    cx: &mut ElementContext<'_>,
+    cx: &mut WindowContext,
 ) -> AnyElement {
     let mut button = button.into_any_element();
     let available_space = size(
diff --git a/crates/multi_buffer/src/multi_buffer.rs b/crates/multi_buffer/src/multi_buffer.rs
index d17f9f58c7..f9ac83b1f0 100644
--- a/crates/multi_buffer/src/multi_buffer.rs
+++ b/crates/multi_buffer/src/multi_buffer.rs
@@ -31,7 +31,6 @@ use std::{
     time::{Duration, Instant},
 };
 use sum_tree::{Bias, Cursor, SumTree};
-use task::RunnableTag;
 use text::{
     locator::Locator,
     subscription::{Subscription, Topic},
diff --git a/crates/project/src/task_inventory.rs b/crates/project/src/task_inventory.rs
index f3da4cefbc..e527482e04 100644
--- a/crates/project/src/task_inventory.rs
+++ b/crates/project/src/task_inventory.rs
@@ -249,7 +249,7 @@ impl Inventory {
             .flat_map(|source| {
                 source
                     .source
-                    .update(cx, |source, cx| source.tasks_to_schedule())
+                    .update(cx, |source, _| source.tasks_to_schedule())
                     .0
                     .into_iter()
                     .map(|task| (&source.kind, task))
diff --git a/crates/task/src/lib.rs b/crates/task/src/lib.rs
index 4505f9426c..28dee7c4ae 100644
--- a/crates/task/src/lib.rs
+++ b/crates/task/src/lib.rs
@@ -6,7 +6,7 @@ mod task_template;
 mod vscode_format;
 
 use collections::{HashMap, HashSet};
-use gpui::{AppContext, ModelContext, SharedString};
+use gpui::SharedString;
 use serde::Serialize;
 use std::any::Any;
 use std::borrow::Cow;
diff --git a/crates/task/src/static_source.rs b/crates/task/src/static_source.rs
index 514007899b..a2aaf6d268 100644
--- a/crates/task/src/static_source.rs
+++ b/crates/task/src/static_source.rs
@@ -1,7 +1,7 @@
 //! A source of tasks, based on a static configuration, deserialized from the tasks config file, and related infrastructure for tracking changes to the file.
 
 use futures::StreamExt;
-use gpui::{AppContext, Context, Model, ModelContext, Subscription};
+use gpui::{AppContext, Context, Model, Subscription};
 use serde::Deserialize;
 use util::ResultExt;
 
diff --git a/crates/task/src/task_template.rs b/crates/task/src/task_template.rs
index f58c19eba4..f2e974a3a2 100644
--- a/crates/task/src/task_template.rs
+++ b/crates/task/src/task_template.rs
@@ -8,8 +8,7 @@ use sha2::{Digest, Sha256};
 use util::{truncate_and_remove_front, ResultExt};
 
 use crate::{
-    ResolvedTask, RunnableTag, SpawnInTerminal, TaskContext, TaskId, VariableName,
-    ZED_VARIABLE_NAME_PREFIX,
+    ResolvedTask, SpawnInTerminal, TaskContext, TaskId, VariableName, ZED_VARIABLE_NAME_PREFIX,
 };
 
 /// A template definition of a Zed task to run.
diff --git a/crates/tasks_ui/src/lib.rs b/crates/tasks_ui/src/lib.rs
index fd91aa8e5b..f52b7beff5 100644
--- a/crates/tasks_ui/src/lib.rs
+++ b/crates/tasks_ui/src/lib.rs
@@ -1,17 +1,11 @@
-use std::{
-    path::{Path, PathBuf},
-    sync::Arc,
-};
+use std::sync::Arc;
 
 use ::settings::Settings;
-use anyhow::Context;
 use editor::{tasks::task_context, Editor};
 use gpui::{AppContext, ViewContext, WindowContext};
-use language::{BasicContextProvider, ContextProvider, Language};
+use language::Language;
 use modal::TasksModal;
-use project::{Location, TaskSourceKind, WorktreeId};
-use task::{ResolvedTask, TaskContext, TaskTemplate, TaskVariables};
-use util::ResultExt;
+use project::WorktreeId;
 use workspace::tasks::schedule_task;
 use workspace::{tasks::schedule_resolved_task, Workspace};