Get worktree out of the way so we can try again

Nathan Sobo and Antonio Scandurra created 

Co-Authored-By: Antonio Scandurra <me@as-cii.com>

Change summary

zed/src/editor/buffer/mod.rs     | 2 +-
zed/src/file_finder.rs           | 2 +-
zed/src/lib.rs                   | 2 +-
zed/src/workspace/workspace.rs   | 2 +-
zed/src/worktree_old/char_bag.rs | 0 
zed/src/worktree_old/fuzzy.rs    | 0 
zed/src/worktree_old/mod.rs      | 0 
zed/src/worktree_old/worktree.rs | 2 +-
8 files changed, 5 insertions(+), 5 deletions(-)

Detailed changes

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};

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},

zed/src/lib.rs 🔗 

@@ -13,4 +13,4 @@ mod timer;
 mod util;
 pub mod watch;
 pub mod workspace;
-mod worktree;
+mod worktree_old;

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};

zed/src/worktree/worktree.rs → 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);
                 }