diff --git a/zed/src/editor/buffer/mod.rs b/zed/src/editor/buffer/mod.rs index 642dc1fc7f..8c44f9768f 100644 --- a/zed/src/editor/buffer/mod.rs +++ b/zed/src/editor/buffer/mod.rs @@ -15,7 +15,7 @@ use crate::{ sum_tree::{self, Cursor, FilterCursor, SeekBias, SumTree}, time::{self, ReplicaId}, util::RandomCharIter, - worktree::FileHandle, + worktree_old::FileHandle, }; use anyhow::{anyhow, Result}; use gpui::{AppContext, Entity, ModelContext}; diff --git a/zed/src/file_finder.rs b/zed/src/file_finder.rs index beb49d503e..87f43db2ee 100644 --- a/zed/src/file_finder.rs +++ b/zed/src/file_finder.rs @@ -3,7 +3,7 @@ use crate::{ settings::Settings, util, watch, workspace::{Workspace, WorkspaceView}, - worktree::{match_paths, PathMatch, Worktree}, + worktree_old::{match_paths, PathMatch, Worktree}, }; use gpui::{ color::{ColorF, ColorU}, diff --git a/zed/src/lib.rs b/zed/src/lib.rs index 066f07a20f..71ae77ad36 100644 --- a/zed/src/lib.rs +++ b/zed/src/lib.rs @@ -13,4 +13,4 @@ mod timer; mod util; pub mod watch; pub mod workspace; -mod worktree; +mod worktree_old; diff --git a/zed/src/workspace/workspace.rs b/zed/src/workspace/workspace.rs index f4518d2704..595a9959ff 100644 --- a/zed/src/workspace/workspace.rs +++ b/zed/src/workspace/workspace.rs @@ -4,7 +4,7 @@ use crate::{ settings::Settings, time::ReplicaId, watch, - worktree::{Worktree, WorktreeHandle as _}, + worktree_old::{Worktree, WorktreeHandle as _}, }; use anyhow::anyhow; use gpui::{AppContext, Entity, Handle, ModelContext, ModelHandle, MutableAppContext, ViewContext}; diff --git a/zed/src/worktree/char_bag.rs b/zed/src/worktree_old/char_bag.rs similarity index 100% rename from zed/src/worktree/char_bag.rs rename to zed/src/worktree_old/char_bag.rs diff --git a/zed/src/worktree/fuzzy.rs b/zed/src/worktree_old/fuzzy.rs similarity index 100% rename from zed/src/worktree/fuzzy.rs rename to zed/src/worktree_old/fuzzy.rs diff --git a/zed/src/worktree/mod.rs b/zed/src/worktree_old/mod.rs similarity index 100% rename from zed/src/worktree/mod.rs rename to zed/src/worktree_old/mod.rs diff --git a/zed/src/worktree/worktree.rs b/zed/src/worktree_old/worktree.rs similarity index 99% rename from zed/src/worktree/worktree.rs rename to zed/src/worktree_old/worktree.rs index 9ff9a0481f..f45c22d1ec 100644 --- a/zed/src/worktree/worktree.rs +++ b/zed/src/worktree_old/worktree.rs @@ -74,7 +74,7 @@ impl Worktree { { let tree = tree.clone(); - ctx.app().scoped_pool().spawn(move || { + ctx.as_ref().scoped_pool().spawn(move || { if let Err(error) = tree.scan_dirs() { log::error!("error scanning worktree: {}", error); }