From cbc1d830676aede99201c14775b00747a5584ce6 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Wed, 14 Apr 2021 11:09:06 -0600
Subject: [PATCH] Get worktree out of the way so we can try again

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
---
 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 => worktree_old}/char_bag.rs | 0
 zed/src/{worktree => worktree_old}/fuzzy.rs    | 0
 zed/src/{worktree => worktree_old}/mod.rs      | 0
 zed/src/{worktree => worktree_old}/worktree.rs | 2 +-
 8 files changed, 5 insertions(+), 5 deletions(-)
 rename zed/src/{worktree => worktree_old}/char_bag.rs (100%)
 rename zed/src/{worktree => worktree_old}/fuzzy.rs (100%)
 rename zed/src/{worktree => worktree_old}/mod.rs (100%)
 rename zed/src/{worktree => worktree_old}/worktree.rs (99%)

diff --git a/zed/src/editor/buffer/mod.rs b/zed/src/editor/buffer/mod.rs
index 642dc1fc7f275d5e6c64e5ecbc00961dd8c8b7d5..8c44f9768feb426e823a76e406b7618eb5a9d622 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 beb49d503e2afc39297c683bcf235441b32a3f23..87f43db2eed9c89fbeb01e8618aa4d7e8ce5a7d6 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 066f07a20f8807e6d1b2abc454d9db7830c1b87b..71ae77ad36112b9da58c5cdfb7ff193495c6564a 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 f4518d270408142122e178c33b86234b2d5f2d39..595a9959ff236436e74dc4d06ba165c6eb6ab42f 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 9ff9a0481fcf710cc90a179d0f3e4ca4bfd760ce..f45c22d1ec7b59f7cd8b60ca2393da39eef489f3 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);
                 }