From d768224182e2a60d70a83717140cc6211f436ac3 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Mon, 4 Oct 2021 13:15:45 -0600
Subject: [PATCH] Clean commented dependencies

Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
---
 rpc_client/Cargo.toml | 31 -------------------------------
 worktree/Cargo.toml   | 27 ++-------------------------
 worktree/src/lib.rs   |  2 +-
 3 files changed, 3 insertions(+), 57 deletions(-)

diff --git a/rpc_client/Cargo.toml b/rpc_client/Cargo.toml
index 9e80487e7edf83fdc21adf04fc049b9f21223d6a..89695fda4c4e7221d60d1ee99f47d512c1afd6df 100644
--- a/rpc_client/Cargo.toml
+++ b/rpc_client/Cargo.toml
@@ -9,47 +9,16 @@ test-support = []
 [dependencies]
 anyhow = "1.0.38"
 async-recursion = "0.3"
-# async-trait = "0.1"
 async-tungstenite = { version = "0.14", features = ["async-tls"] }
-# buffer = { path = "../buffer" }
-# clock = { path = "../clock" }
-# crossbeam-channel = "0.5.0"
-# ctor = "0.1.20"
-# dirs = "3.0"
-# easy-parallel = "3.1.0"
-# fsevent = { path = "../fsevent" }
-# futures = "0.3"
-# fuzzy = { path = "../fuzzy" }
 gpui = { path = "../gpui" }
-# http-auth-basic = "0.1.3"
-# ignore = "0.4"
-# image = "0.23"
-# indexmap = "1.6.2"
 lazy_static = "1.4.0"
-# libc = "0.2"
 log = "0.4"
-# log-panics = { version = "2.0", features = ["with-backtrace"] }
-# num_cpus = "1.13.0"
 parking_lot = "0.11.1"
 postage = { version = "0.4.1", features = ["futures-traits"] }
 rand = "0.8.3"
-# rsa = "0.4"
-# rust-embed = { version = "6.2", features = ["include-exclude"] }
-# serde = { version = "1", features = ["derive"] }
-# serde_json = { version = "1.0.64", features = ["preserve_order"] }
-# serde_path_to_error = "0.1.4"
-# simplelog = "0.9"
-# smallvec = { version = "1.6", features = ["union"] }
 smol = "1.2.5"
-# sum_tree = { path = "../sum_tree" }
 surf = "2.2"
-# tempdir = { version = "0.3.7", optional = true }
 thiserror = "1.0.29"
-# time = { version = "0.3" }
 tiny_http = "0.8"
-# toml = "0.5"
-# tree-sitter = "0.19.5"
-# tree-sitter-rust = "0.19.0"
 util = { path = "../util" }
-# url = "2.2"
 zrpc = { path = "../zrpc" }
diff --git a/worktree/Cargo.toml b/worktree/Cargo.toml
index 78f539002bead82fbc4666d8671de5b3deebdd8e..592f2908e927ffd29b0b7563b4da9a3fd9192c1e 100644
--- a/worktree/Cargo.toml
+++ b/worktree/Cargo.toml
@@ -8,54 +8,31 @@ test-support = []
 
 [dependencies]
 anyhow = "1.0.38"
-# async-recursion = "0.3"
 async-trait = "0.1"
-# async-tungstenite = { version = "0.14", features = ["async-tls"] }
 buffer = { path = "../buffer" }
 clock = { path = "../clock" }
-# crossbeam-channel = "0.5.0"
-# ctor = "0.1.20"
-# dirs = "3.0"
-# easy-parallel = "3.1.0"
 fsevent = { path = "../fsevent" }
 futures = "0.3"
 fuzzy = { path = "../fuzzy" }
 gpui = { path = "../gpui" }
-# http-auth-basic = "0.1.3"
 ignore = "0.4"
-# image = "0.23"
-# indexmap = "1.6.2"
 lazy_static = "1.4.0"
 libc = "0.2"
 log = "0.4"
-# log-panics = { version = "2.0", features = ["with-backtrace"] }
-# num_cpus = "1.13.0"
 parking_lot = "0.11.1"
 postage = { version = "0.4.1", features = ["futures-traits"] }
 rpc_client = { path = "../rpc_client" }
-# rand = "0.8.3"
-# rsa = "0.4"
-# rust-embed = { version = "6.2", features = ["include-exclude"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = { version = "1.0.64", features = ["preserve_order"] }
-# serde_path_to_error = "0.1.4"
-# simplelog = "0.9"
-# smallvec = { version = "1.6", features = ["union"] }
 smol = "1.2.5"
 sum_tree = { path = "../sum_tree" }
 util = { path = "../util" }
-# surf = "2.2"
-# tempdir = { version = "0.3.7", optional = true }
-# thiserror = "1.0.29"
-# time = { version = "0.3" }
-# tiny_http = "0.8"
 toml = "0.5"
-# tree-sitter = "0.19.5"
-# tree-sitter-rust = "0.19.0"
-# url = "2.2"
 zrpc = { path = "../zrpc" }
 
 [dev-dependencies]
 rand = "0.8.3"
+rpc_client = { path = "../rpc_client", features = ["test-support"] }
 tempdir = { version = "0.3.7" }
 util = { path = "../util", features = ["test-support"] }
+zrpc = { path = "../zrpc", features = ["test-support"] }
diff --git a/worktree/src/lib.rs b/worktree/src/lib.rs
index e6d8769853620bacaefd40521cc643f1d9a2e066..d284ba376bd64184ea63762b1c1c559092465129 100644
--- a/worktree/src/lib.rs
+++ b/worktree/src/lib.rs
@@ -2832,11 +2832,11 @@ impl<'a> TryFrom<(&'a CharBag, proto::Entry)> for Entry {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use rpc_client::test::FakeServer;
     use crate::fs::FakeFs;
     use anyhow::Result;
     use fs::RealFs;
     use rand::prelude::*;
+    use rpc_client::test::FakeServer;
     use serde_json::json;
     use std::{cell::RefCell, rc::Rc};
     use std::{