From ed20a857f485a471369cd99b843af19a4d875ad0 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 13 Aug 2020 16:25:38 +0200 Subject: Rename ra_db -> base_db --- Cargo.lock | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index 9878dd88f..a99dd6e04 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -83,6 +83,21 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" +[[package]] +name = "base_db" +version = "0.0.0" +dependencies = [ + "cfg", + "profile", + "rustc-hash", + "salsa", + "stdx", + "syntax", + "test_utils", + "tt", + "vfs", +] + [[package]] name = "bitflags" version = "1.2.1" @@ -956,12 +971,12 @@ version = "0.0.0" dependencies = [ "anyhow", "arena", + "base_db", "cargo_metadata", "cfg", "log", "paths", "proc_macro_api", - "ra_db", "rustc-hash", "serde", "serde_json", @@ -982,10 +997,10 @@ dependencies = [ name = "ra_assists" version = "0.1.0" dependencies = [ + "base_db", "either", "itertools", "profile", - "ra_db", "ra_hir", "ra_ide_db", "rustc-hash", @@ -995,31 +1010,16 @@ dependencies = [ "text_edit", ] -[[package]] -name = "ra_db" -version = "0.1.0" -dependencies = [ - "cfg", - "profile", - "rustc-hash", - "salsa", - "stdx", - "syntax", - "test_utils", - "tt", - "vfs", -] - [[package]] name = "ra_hir" version = "0.1.0" dependencies = [ "arrayvec", + "base_db", "either", "itertools", "log", "profile", - "ra_db", "ra_hir_def", "ra_hir_expand", "ra_hir_ty", @@ -1034,6 +1034,7 @@ version = "0.1.0" dependencies = [ "anymap", "arena", + "base_db", "cfg", "drop_bomb", "either", @@ -1045,7 +1046,6 @@ dependencies = [ "mbe", "once_cell", "profile", - "ra_db", "ra_hir_expand", "rustc-hash", "smallvec", @@ -1060,12 +1060,12 @@ name = "ra_hir_expand" version = "0.1.0" dependencies = [ "arena", + "base_db", "either", "log", "mbe", "parser", "profile", - "ra_db", "rustc-hash", "syntax", "test_utils", @@ -1078,6 +1078,7 @@ version = "0.1.0" dependencies = [ "arena", "arrayvec", + "base_db", "chalk-ir", "chalk-recursive", "chalk-solve", @@ -1086,7 +1087,6 @@ dependencies = [ "itertools", "log", "profile", - "ra_db", "ra_hir_def", "ra_hir_expand", "rustc-hash", @@ -1104,6 +1104,7 @@ dependencies = [ name = "ra_ide" version = "0.1.0" dependencies = [ + "base_db", "cfg", "either", "expect", @@ -1113,7 +1114,6 @@ dependencies = [ "oorandom", "profile", "ra_assists", - "ra_db", "ra_hir", "ra_ide_db", "ra_ssr", @@ -1128,12 +1128,12 @@ dependencies = [ name = "ra_ide_db" version = "0.1.0" dependencies = [ + "base_db", "either", "fst", "log", "once_cell", "profile", - "ra_db", "ra_hir", "rayon", "rustc-hash", @@ -1147,8 +1147,8 @@ dependencies = [ name = "ra_ssr" version = "0.1.0" dependencies = [ + "base_db", "expect", - "ra_db", "ra_hir", "ra_ide_db", "rustc-hash", @@ -1230,6 +1230,7 @@ name = "rust-analyzer" version = "0.1.0" dependencies = [ "anyhow", + "base_db", "cfg", "crossbeam-channel", "env_logger", @@ -1248,7 +1249,6 @@ dependencies = [ "proc_macro_srv", "profile", "project_model", - "ra_db", "ra_hir", "ra_hir_def", "ra_hir_ty", -- cgit v1.2.3 From b7aa4898e0841ab8199643f89a0caa967b698ca8 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 13 Aug 2020 16:26:29 +0200 Subject: Rename ra_hir_expand -> hir_expand --- Cargo.lock | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index a99dd6e04..768c3293d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -463,6 +463,23 @@ dependencies = [ "libc", ] +[[package]] +name = "hir_expand" +version = "0.0.0" +dependencies = [ + "arena", + "base_db", + "either", + "log", + "mbe", + "parser", + "profile", + "rustc-hash", + "syntax", + "test_utils", + "tt", +] + [[package]] name = "home" version = "0.5.3" @@ -1017,11 +1034,11 @@ dependencies = [ "arrayvec", "base_db", "either", + "hir_expand", "itertools", "log", "profile", "ra_hir_def", - "ra_hir_expand", "ra_hir_ty", "rustc-hash", "stdx", @@ -1040,13 +1057,13 @@ dependencies = [ "either", "expect", "fst", + "hir_expand", "indexmap", "itertools", "log", "mbe", "once_cell", "profile", - "ra_hir_expand", "rustc-hash", "smallvec", "stdx", @@ -1055,23 +1072,6 @@ dependencies = [ "tt", ] -[[package]] -name = "ra_hir_expand" -version = "0.1.0" -dependencies = [ - "arena", - "base_db", - "either", - "log", - "mbe", - "parser", - "profile", - "rustc-hash", - "syntax", - "test_utils", - "tt", -] - [[package]] name = "ra_hir_ty" version = "0.1.0" @@ -1084,11 +1084,11 @@ dependencies = [ "chalk-solve", "ena", "expect", + "hir_expand", "itertools", "log", "profile", "ra_hir_def", - "ra_hir_expand", "rustc-hash", "scoped-tls", "smallvec", -- cgit v1.2.3 From b28c54a2c239acd73f2eea80fda9ee3960d2c046 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 13 Aug 2020 16:28:27 +0200 Subject: Rename ra_hir_def -> hir_def --- Cargo.lock | 60 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 30 insertions(+), 30 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index 768c3293d..702bd5191 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -463,6 +463,33 @@ dependencies = [ "libc", ] +[[package]] +name = "hir_def" +version = "0.0.0" +dependencies = [ + "anymap", + "arena", + "base_db", + "cfg", + "drop_bomb", + "either", + "expect", + "fst", + "hir_expand", + "indexmap", + "itertools", + "log", + "mbe", + "once_cell", + "profile", + "rustc-hash", + "smallvec", + "stdx", + "syntax", + "test_utils", + "tt", +] + [[package]] name = "hir_expand" version = "0.0.0" @@ -1034,44 +1061,17 @@ dependencies = [ "arrayvec", "base_db", "either", + "hir_def", "hir_expand", "itertools", "log", "profile", - "ra_hir_def", "ra_hir_ty", "rustc-hash", "stdx", "syntax", ] -[[package]] -name = "ra_hir_def" -version = "0.1.0" -dependencies = [ - "anymap", - "arena", - "base_db", - "cfg", - "drop_bomb", - "either", - "expect", - "fst", - "hir_expand", - "indexmap", - "itertools", - "log", - "mbe", - "once_cell", - "profile", - "rustc-hash", - "smallvec", - "stdx", - "syntax", - "test_utils", - "tt", -] - [[package]] name = "ra_hir_ty" version = "0.1.0" @@ -1084,11 +1084,11 @@ dependencies = [ "chalk-solve", "ena", "expect", + "hir_def", "hir_expand", "itertools", "log", "profile", - "ra_hir_def", "rustc-hash", "scoped-tls", "smallvec", @@ -1236,6 +1236,7 @@ dependencies = [ "env_logger", "expect", "flycheck", + "hir_def", "itertools", "jod-thread", "log", @@ -1250,7 +1251,6 @@ dependencies = [ "profile", "project_model", "ra_hir", - "ra_hir_def", "ra_hir_ty", "ra_ide", "ra_ide_db", -- cgit v1.2.3