From 659b0e73cfd9ef7755d032f90622a08576f1d86d Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Mon, 17 Feb 2020 19:03:03 +0100 Subject: Merge cli and ra_lsp_server --- Cargo.lock | 32 ++++++++------------------------ 1 file changed, 8 insertions(+), 24 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index 82f910c1b..ccdcfbee3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -941,30 +941,6 @@ dependencies = [ "rustc-hash", ] -[[package]] -name = "ra_cli" -version = "0.1.0" -dependencies = [ - "anyhow", - "crossbeam-channel", - "env_logger", - "itertools", - "log", - "pico-args", - "ra_db", - "ra_hir", - "ra_hir_def", - "ra_hir_ty", - "ra_ide", - "ra_prof", - "ra_project_model", - "ra_syntax", - "ra_vfs", - "ra_vfs_glob", - "rand", - "rustc-hash", -] - [[package]] name = "ra_db" version = "0.1.0" @@ -1122,15 +1098,22 @@ dependencies = [ name = "ra_lsp_server" version = "0.1.0" dependencies = [ + "anyhow", "crossbeam-channel", "either", "env_logger", + "itertools", "jod-thread", "log", "lsp-server", "lsp-types", "parking_lot", + "pico-args", "ra_cargo_watch", + "ra_db", + "ra_hir", + "ra_hir_def", + "ra_hir_ty", "ra_ide", "ra_prof", "ra_project_model", @@ -1138,6 +1121,7 @@ dependencies = [ "ra_text_edit", "ra_vfs", "ra_vfs_glob", + "rand", "relative-path", "rustc-hash", "serde", -- cgit v1.2.3 From 2c9b91ad326c387190bedab9dae9d08d3eb0705a Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Mon, 17 Feb 2020 19:07:30 +0100 Subject: Merge ra_vfs_glob and ra_lsp_server --- Cargo.lock | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index ccdcfbee3..c22cbca3a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1102,6 +1102,7 @@ dependencies = [ "crossbeam-channel", "either", "env_logger", + "globset", "itertools", "jod-thread", "log", @@ -1120,7 +1121,6 @@ dependencies = [ "ra_syntax", "ra_text_edit", "ra_vfs", - "ra_vfs_glob", "rand", "relative-path", "rustc-hash", @@ -1227,14 +1227,6 @@ dependencies = [ "walkdir", ] -[[package]] -name = "ra_vfs_glob" -version = "0.1.0" -dependencies = [ - "globset", - "ra_vfs", -] - [[package]] name = "rand" version = "0.7.3" -- cgit v1.2.3