Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fmt and update dependency

Browse source
This commit is contained in:
Mikayla Maki 2023-06-29 17:49:42 -07:00
parent cd670e340f
commit 787412b545
No known key found for this signature in database
5 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/collab/Cargo.toml
View file

@ -67,7 +67,7 @@ fs = { path = "../fs", features = ["test-support"] }
git = { path = "../git", features = ["test-support"] } git = { path = "../git", features = ["test-support"] }
live_kit_client = { path = "../live_kit_client", features = ["test-support"] } live_kit_client = { path = "../live_kit_client", features = ["test-support"] }
lsp = { path = "../lsp", features = ["test-support"] } lsp = { path = "../lsp", features = ["test-support"] }
pretty_assertions = "*" pretty_assertions.workspace = true
project = { path = "../project", features = ["test-support"] } project = { path = "../project", features = ["test-support"] }
rpc = { path = "../rpc", features = ["test-support"] } rpc = { path = "../rpc", features = ["test-support"] }
settings = { path = "../settings", features = ["test-support"] } settings = { path = "../settings", features = ["test-support"] }

2
crates/project/Cargo.toml
View file

@ -64,7 +64,7 @@ itertools = "0.10"
[dev-dependencies] [dev-dependencies]
ctor.workspace = true ctor.workspace = true
env_logger.workspace = true env_logger.workspace = true
pretty_assertions = "*" pretty_assertions.workspace = true
client = { path = "../client", features = ["test-support"] } client = { path = "../client", features = ["test-support"] }
collections = { path = "../collections", features = ["test-support"] } collections = { path = "../collections", features = ["test-support"] }
db = { path = "../db", features = ["test-support"] } db = { path = "../db", features = ["test-support"] }

15
crates/project/src/worktree_tests.rs
View file

@ -941,13 +941,14 @@ async fn test_create_dir_all_on_create_entry(cx: &mut TestAppContext) {
let client_fake = cx.read(|cx| Client::new(FakeHttpClient::with_404_response(), cx)); let client_fake = cx.read(|cx| Client::new(FakeHttpClient::with_404_response(), cx));
let fs_fake = FakeFs::new(cx.background()); let fs_fake = FakeFs::new(cx.background());
fs_fake.insert_tree( fs_fake
"/root", .insert_tree(
json!({ "/root",
"a": {}, json!({
}), "a": {},
) }),
.await; )
.await;
let tree_fake = Worktree::local( let tree_fake = Worktree::local(
client_fake, client_fake,

3
crates/project_panel/src/project_panel.rs
View file

@ -981,7 +981,6 @@ impl ProjectPanel {
} }
} }
Some(()) Some(())
} }
@ -1159,7 +1158,6 @@ impl ProjectPanel {
for entry in visible_worktree_entries[entry_range].iter() { for entry in visible_worktree_entries[entry_range].iter() {
let status = git_status_setting.then(|| entry.git_status).flatten(); let status = git_status_setting.then(|| entry.git_status).flatten();
let mut details = EntryDetails { let mut details = EntryDetails {
filename: entry filename: entry
.path .path
@ -2108,7 +2106,6 @@ mod tests {
] ]
); );
let confirm = panel.update(cx, |panel, cx| { let confirm = panel.update(cx, |panel, cx| {
panel.filename_editor.update(cx, |editor, cx| { panel.filename_editor.update(cx, |editor, cx| {
editor.set_text("/bdir1/dir2/the-new-filename", cx) editor.set_text("/bdir1/dir2/the-new-filename", cx)

2
crates/settings/Cargo.toml
View file

@ -38,5 +38,5 @@ tree-sitter-json = "*"
gpui = { path = "../gpui", features = ["test-support"] } gpui = { path = "../gpui", features = ["test-support"] }
fs = { path = "../fs", features = ["test-support"] } fs = { path = "../fs", features = ["test-support"] }
indoc.workspace = true indoc.workspace = true
pretty_assertions = "*" pretty_assertions.workspace = true
unindent.workspace = true unindent.workspace = true