Remove ui dependency from assistant_tool and context_server (#27449)

This PR removes the dependency on the `ui` crate from the
`assistant_tool` and `context_server` crates.

These crates were only depending on it for `IconName`, which can now be
depended on from `icons` directly.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2025-03-25 14:37:15 -04:00 committed by GitHub
parent 4a30b960d4
commit 581d67398a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 10 additions and 9 deletions

4
Cargo.lock generated
View file

@ -698,13 +698,13 @@ dependencies = [
"collections", "collections",
"derive_more", "derive_more",
"gpui", "gpui",
"icons",
"language", "language",
"language_model", "language_model",
"parking_lot", "parking_lot",
"project", "project",
"serde", "serde",
"serde_json", "serde_json",
"ui",
] ]
[[package]] [[package]]
@ -3198,6 +3198,7 @@ dependencies = [
"extension", "extension",
"futures 0.3.31", "futures 0.3.31",
"gpui", "gpui",
"icons",
"language_model", "language_model",
"log", "log",
"parking_lot", "parking_lot",
@ -3207,7 +3208,6 @@ dependencies = [
"serde_json", "serde_json",
"settings", "settings",
"smol", "smol",
"ui",
"url", "url",
"util", "util",
] ]

View file

@ -13,14 +13,14 @@ path = "src/assistant_tool.rs"
[dependencies] [dependencies]
anyhow.workspace = true anyhow.workspace = true
collections.workspace = true
clock.workspace = true clock.workspace = true
collections.workspace = true
derive_more.workspace = true derive_more.workspace = true
gpui.workspace = true gpui.workspace = true
icons.workspace = true
language.workspace = true language.workspace = true
language_model.workspace = true language_model.workspace = true
parking_lot.workspace = true parking_lot.workspace = true
project.workspace = true project.workspace = true
serde.workspace = true serde.workspace = true
serde_json.workspace = true serde_json.workspace = true
ui.workspace = true

View file

@ -1,15 +1,16 @@
mod tool_registry; mod tool_registry;
mod tool_working_set; mod tool_working_set;
use std::fmt::{self, Debug, Formatter};
use std::sync::Arc;
use anyhow::Result; use anyhow::Result;
use collections::{HashMap, HashSet}; use collections::{HashMap, HashSet};
use gpui::{App, Context, Entity, SharedString, Task}; use gpui::{App, Context, Entity, SharedString, Task};
use icons::IconName;
use language::Buffer; use language::Buffer;
use language_model::LanguageModelRequestMessage; use language_model::LanguageModelRequestMessage;
use project::Project; use project::Project;
use std::fmt::{self, Debug, Formatter};
use std::sync::Arc;
use ui::IconName;
pub use crate::tool_registry::*; pub use crate::tool_registry::*;
pub use crate::tool_working_set::*; pub use crate::tool_working_set::*;

View file

@ -21,6 +21,7 @@ context_server_settings.workspace = true
extension.workspace = true extension.workspace = true
futures.workspace = true futures.workspace = true
gpui.workspace = true gpui.workspace = true
icons.workspace = true
language_model.workspace = true language_model.workspace = true
log.workspace = true log.workspace = true
parking_lot.workspace = true parking_lot.workspace = true
@ -30,6 +31,5 @@ serde.workspace = true
serde_json.workspace = true serde_json.workspace = true
settings.workspace = true settings.workspace = true
smol.workspace = true smol.workspace = true
ui.workspace = true
url = { workspace = true, features = ["serde"] } url = { workspace = true, features = ["serde"] }
util.workspace = true util.workspace = true

View file

@ -3,9 +3,9 @@ use std::sync::Arc;
use anyhow::{anyhow, bail, Result}; use anyhow::{anyhow, bail, Result};
use assistant_tool::{ActionLog, Tool, ToolSource}; use assistant_tool::{ActionLog, Tool, ToolSource};
use gpui::{App, Entity, Task}; use gpui::{App, Entity, Task};
use icons::IconName;
use language_model::LanguageModelRequestMessage; use language_model::LanguageModelRequestMessage;
use project::Project; use project::Project;
use ui::IconName;
use crate::manager::ContextServerManager; use crate::manager::ContextServerManager;
use crate::types; use crate::types;