From 787412b545cd6e9e4cb0f40f5d33d3b9a4480a22 Mon Sep 17 00:00:00 2001 From: Mikayla Maki Date: Thu, 29 Jun 2023 17:49:42 -0700 Subject: [PATCH] fmt and update dependency --- crates/collab/Cargo.toml | 2 +- crates/project/Cargo.toml | 2 +- crates/project/src/worktree_tests.rs | 15 ++++++++------- crates/project_panel/src/project_panel.rs | 3 --- crates/settings/Cargo.toml | 2 +- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/crates/collab/Cargo.toml b/crates/collab/Cargo.toml index 0c752a2047..c787287a0c 100644 --- a/crates/collab/Cargo.toml +++ b/crates/collab/Cargo.toml @@ -67,7 +67,7 @@ fs = { path = "../fs", features = ["test-support"] } git = { path = "../git", features = ["test-support"] } live_kit_client = { path = "../live_kit_client", features = ["test-support"] } lsp = { path = "../lsp", features = ["test-support"] } -pretty_assertions = "*" +pretty_assertions.workspace = true project = { path = "../project", features = ["test-support"] } rpc = { path = "../rpc", features = ["test-support"] } settings = { path = "../settings", features = ["test-support"] } diff --git a/crates/project/Cargo.toml b/crates/project/Cargo.toml index dbc0c617f2..bfe5f89f68 100644 --- a/crates/project/Cargo.toml +++ b/crates/project/Cargo.toml @@ -64,7 +64,7 @@ itertools = "0.10" [dev-dependencies] ctor.workspace = true env_logger.workspace = true -pretty_assertions = "*" +pretty_assertions.workspace = true client = { path = "../client", features = ["test-support"] } collections = { path = "../collections", features = ["test-support"] } db = { path = "../db", features = ["test-support"] } diff --git a/crates/project/src/worktree_tests.rs b/crates/project/src/worktree_tests.rs index efc5f42369..63f1f28eea 100644 --- a/crates/project/src/worktree_tests.rs +++ b/crates/project/src/worktree_tests.rs @@ -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 fs_fake = FakeFs::new(cx.background()); - fs_fake.insert_tree( - "/root", - json!({ - "a": {}, - }), - ) - .await; + fs_fake + .insert_tree( + "/root", + json!({ + "a": {}, + }), + ) + .await; let tree_fake = Worktree::local( client_fake, diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs index fe8c649420..c329ae4e51 100644 --- a/crates/project_panel/src/project_panel.rs +++ b/crates/project_panel/src/project_panel.rs @@ -981,7 +981,6 @@ impl ProjectPanel { } } - Some(()) } @@ -1159,7 +1158,6 @@ impl ProjectPanel { for entry in visible_worktree_entries[entry_range].iter() { let status = git_status_setting.then(|| entry.git_status).flatten(); - let mut details = EntryDetails { filename: entry .path @@ -2108,7 +2106,6 @@ mod tests { ] ); - let confirm = panel.update(cx, |panel, cx| { panel.filename_editor.update(cx, |editor, cx| { editor.set_text("/bdir1/dir2/the-new-filename", cx) diff --git a/crates/settings/Cargo.toml b/crates/settings/Cargo.toml index 6c1ded805b..06b81a0c61 100644 --- a/crates/settings/Cargo.toml +++ b/crates/settings/Cargo.toml @@ -38,5 +38,5 @@ tree-sitter-json = "*" gpui = { path = "../gpui", features = ["test-support"] } fs = { path = "../fs", features = ["test-support"] } indoc.workspace = true -pretty_assertions = "*" +pretty_assertions.workspace = true unindent.workspace = true