diff --git a/Cargo.lock b/Cargo.lock index 99b7f650c0..5d4d05ef74 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5973,61 +5973,6 @@ dependencies = [ "util", ] -[[package]] -name = "project2" -version = "0.1.0" -dependencies = [ - "aho-corasick", - "anyhow", - "async-trait", - "backtrace", - "client2", - "clock", - "collections", - "copilot2", - "ctor", - "db2", - "env_logger 0.9.3", - "fs", - "fsevent", - "futures 0.3.28", - "fuzzy2", - "git", - "git2", - "globset", - "gpui2", - "ignore", - "itertools 0.10.5", - "language2", - "lazy_static", - "log", - "lsp2", - "node_runtime", - "parking_lot 0.11.2", - "postage", - "prettier2", - "pretty_assertions", - "rand 0.8.5", - "regex", - "rpc", - "schemars", - "serde", - "serde_derive", - "serde_json", - "settings2", - "sha2 0.10.7", - "similar", - "smol", - "sum_tree", - "tempdir", - "terminal", - "text", - "thiserror", - "toml 0.5.11", - "unindent", - "util", -] - [[package]] name = "project_panel" version = "0.1.0" @@ -8394,35 +8339,6 @@ dependencies = [ "util", ] -[[package]] -name = "terminal2" -version = "0.1.0" -dependencies = [ - "alacritty_terminal", - "anyhow", - "db2", - "dirs 4.0.0", - "futures 0.3.28", - "gpui2", - "itertools 0.10.5", - "lazy_static", - "libc", - "mio-extras", - "ordered-float 2.10.0", - "procinfo", - "rand 0.8.5", - "schemars", - "serde", - "serde_derive", - "settings2", - "shellexpand", - "smallvec", - "smol", - "theme2", - "thiserror", - "util", -] - [[package]] name = "terminal_view" version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index c42feac8fb..b4bb2b3bf2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -63,7 +63,7 @@ members = [ "crates/prettier", "crates/prettier2", "crates/project", - "crates/project2", + # "crates/project2", "crates/project_panel", "crates/project_symbols", "crates/recent_projects", @@ -79,7 +79,7 @@ members = [ "crates/storybook2", "crates/sum_tree", "crates/terminal", - "crates/terminal2", + # "crates/terminal2", "crates/text", "crates/theme", "crates/theme2", diff --git a/crates/prettier2/src/prettier2.rs b/crates/prettier2/src/prettier2.rs index c03e98c094..4e8d8b9070 100644 --- a/crates/prettier2/src/prettier2.rs +++ b/crates/prettier2/src/prettier2.rs @@ -195,7 +195,7 @@ impl Prettier { ) -> anyhow::Result { use lsp2::LanguageServerBinary; - let executor = cx.executor(); + let executor = cx.executor().clone(); anyhow::ensure!( prettier_dir.is_dir(), "Prettier dir {prettier_dir:?} is not a directory"