Fix fs2 import on zed

Conrad Irwin created 2 years ago

Change summary

Cargo.lock              | 2 +-
crates/zed2/Cargo.toml  | 2 +-
crates/zed2/src/main.rs | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)

Detailed changes

Cargo.lock

@@ -10745,7 +10745,7 @@ dependencies = [
  "db2",
  "env_logger 0.9.3",
  "feature_flags",
- "fs",
+ "fs2",
  "fsevent",
  "futures 0.3.28",
  "fuzzy",

crates/zed2/Cargo.toml

@@ -37,7 +37,7 @@ db2 = { path = "../db2" }
 # feedback = { path = "../feedback" }
 # file_finder = { path = "../file_finder" }
 # search = { path = "../search" }
-fs = { path = "../fs" }
+fs2 = { path = "../fs2" }
 fsevent = { path = "../fsevent" }
 fuzzy = { path = "../fuzzy" }
 # go_to_line = { path = "../go_to_line" }

crates/zed2/src/main.rs

@@ -9,7 +9,7 @@ use cli::{
     CliRequest, CliResponse, IpcHandshake, FORCE_CLI_MODE_ENV_VAR_NAME,
 };
 use db2::kvp::KEY_VALUE_STORE;
-use fs::RealFs;
+use fs2::RealFs;
 use futures::{channel::mpsc, SinkExt, StreamExt};
 use gpui2::{App, AppContext, AsyncAppContext, SemanticVersion, Task};
 use isahc::{prelude::Configurable, Request};