mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-10 20:29:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fix fs2 import on zed

Browse source
This commit is contained in:
Conrad Irwin 2023-10-26 11:41:15 +02:00
parent b875be9689
commit 693246ba26
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock generated
View file

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

2
crates/zed2/Cargo.toml
View file

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

2
crates/zed2/src/main.rs
View file

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