aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cargo.lock36
-rw-r--r--crates/mbe/Cargo.toml (renamed from crates/ra_mbe/Cargo.toml)15
-rw-r--r--crates/mbe/src/lib.rs (renamed from crates/ra_mbe/src/lib.rs)0
-rw-r--r--crates/mbe/src/mbe_expander.rs (renamed from crates/ra_mbe/src/mbe_expander.rs)0
-rw-r--r--crates/mbe/src/mbe_expander/matcher.rs (renamed from crates/ra_mbe/src/mbe_expander/matcher.rs)0
-rw-r--r--crates/mbe/src/mbe_expander/transcriber.rs (renamed from crates/ra_mbe/src/mbe_expander/transcriber.rs)0
-rw-r--r--crates/mbe/src/parser.rs (renamed from crates/ra_mbe/src/parser.rs)0
-rw-r--r--crates/mbe/src/subtree_source.rs (renamed from crates/ra_mbe/src/subtree_source.rs)0
-rw-r--r--crates/mbe/src/syntax_bridge.rs (renamed from crates/ra_mbe/src/syntax_bridge.rs)0
-rw-r--r--crates/mbe/src/tests.rs (renamed from crates/ra_mbe/src/tests.rs)0
-rw-r--r--crates/mbe/src/tt_iter.rs (renamed from crates/ra_mbe/src/tt_iter.rs)0
-rw-r--r--crates/proc_macro_srv/Cargo.toml2
-rw-r--r--crates/proc_macro_srv/src/rustc_server.rs2
-rw-r--r--crates/ra_cfg/Cargo.toml2
-rw-r--r--crates/ra_cfg/src/cfg_expr.rs2
-rw-r--r--crates/ra_hir_def/Cargo.toml2
-rw-r--r--crates/ra_hir_expand/Cargo.toml2
-rw-r--r--crates/rust-analyzer/Cargo.toml2
-rw-r--r--xtask/tests/tidy.rs2
19 files changed, 34 insertions, 33 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 6bace7bd2..a63cd58f2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -636,6 +636,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
636checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" 636checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
637 637
638[[package]] 638[[package]]
639name = "mbe"
640version = "0.0.0"
641dependencies = [
642 "log",
643 "parser",
644 "rustc-hash",
645 "smallvec",
646 "syntax",
647 "test_utils",
648 "tt",
649]
650
651[[package]]
639name = "memmap" 652name = "memmap"
640version = "0.7.0" 653version = "0.7.0"
641source = "registry+https://github.com/rust-lang/crates.io-index" 654source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -894,8 +907,8 @@ dependencies = [
894 "difference", 907 "difference",
895 "goblin", 908 "goblin",
896 "libloading", 909 "libloading",
910 "mbe",
897 "memmap", 911 "memmap",
898 "ra_mbe",
899 "ra_proc_macro", 912 "ra_proc_macro",
900 "serde_derive", 913 "serde_derive",
901 "test_utils", 914 "test_utils",
@@ -946,7 +959,7 @@ dependencies = [
946name = "ra_cfg" 959name = "ra_cfg"
947version = "0.1.0" 960version = "0.1.0"
948dependencies = [ 961dependencies = [
949 "ra_mbe", 962 "mbe",
950 "rustc-hash", 963 "rustc-hash",
951 "syntax", 964 "syntax",
952 "tt", 965 "tt",
@@ -1006,12 +1019,12 @@ dependencies = [
1006 "indexmap", 1019 "indexmap",
1007 "itertools", 1020 "itertools",
1008 "log", 1021 "log",
1022 "mbe",
1009 "once_cell", 1023 "once_cell",
1010 "profile", 1024 "profile",
1011 "ra_cfg", 1025 "ra_cfg",
1012 "ra_db", 1026 "ra_db",
1013 "ra_hir_expand", 1027 "ra_hir_expand",
1014 "ra_mbe",
1015 "rustc-hash", 1028 "rustc-hash",
1016 "smallvec", 1029 "smallvec",
1017 "stdx", 1030 "stdx",
@@ -1027,10 +1040,10 @@ dependencies = [
1027 "arena", 1040 "arena",
1028 "either", 1041 "either",
1029 "log", 1042 "log",
1043 "mbe",
1030 "parser", 1044 "parser",
1031 "profile", 1045 "profile",
1032 "ra_db", 1046 "ra_db",
1033 "ra_mbe",
1034 "rustc-hash", 1047 "rustc-hash",
1035 "syntax", 1048 "syntax",
1036 "test_utils", 1049 "test_utils",
@@ -1110,19 +1123,6 @@ dependencies = [
1110] 1123]
1111 1124
1112[[package]] 1125[[package]]
1113name = "ra_mbe"
1114version = "0.1.0"
1115dependencies = [
1116 "log",
1117 "parser",
1118 "rustc-hash",
1119 "smallvec",
1120 "syntax",
1121 "test_utils",
1122 "tt",
1123]
1124
1125[[package]]
1126name = "ra_proc_macro" 1126name = "ra_proc_macro"
1127version = "0.1.0" 1127version = "0.1.0"
1128dependencies = [ 1128dependencies = [
@@ -1249,6 +1249,7 @@ dependencies = [
1249 "log", 1249 "log",
1250 "lsp-server", 1250 "lsp-server",
1251 "lsp-types", 1251 "lsp-types",
1252 "mbe",
1252 "mimalloc", 1253 "mimalloc",
1253 "oorandom", 1254 "oorandom",
1254 "parking_lot", 1255 "parking_lot",
@@ -1262,7 +1263,6 @@ dependencies = [
1262 "ra_hir_ty", 1263 "ra_hir_ty",
1263 "ra_ide", 1264 "ra_ide",
1264 "ra_ide_db", 1265 "ra_ide_db",
1265 "ra_mbe",
1266 "ra_project_model", 1266 "ra_project_model",
1267 "ra_ssr", 1267 "ra_ssr",
1268 "rayon", 1268 "rayon",
diff --git a/crates/ra_mbe/Cargo.toml b/crates/mbe/Cargo.toml
index 4a4be65eb..1aba8b7c4 100644
--- a/crates/ra_mbe/Cargo.toml
+++ b/crates/mbe/Cargo.toml
@@ -1,20 +1,21 @@
1[package] 1[package]
2edition = "2018" 2name = "mbe"
3name = "ra_mbe" 3version = "0.0.0"
4version = "0.1.0"
5authors = ["rust-analyzer developers"]
6license = "MIT OR Apache-2.0" 4license = "MIT OR Apache-2.0"
5authors = ["rust-analyzer developers"]
6edition = "2018"
7 7
8[lib] 8[lib]
9doctest = false 9doctest = false
10 10
11[dependencies] 11[dependencies]
12syntax = { path = "../syntax" }
13parser = { path = "../parser" }
14tt = { path = "../tt" }
15rustc-hash = "1.1.0" 12rustc-hash = "1.1.0"
16smallvec = "1.2.0" 13smallvec = "1.2.0"
17log = "0.4.8" 14log = "0.4.8"
18 15
16syntax = { path = "../syntax" }
17parser = { path = "../parser" }
18tt = { path = "../tt" }
19
19[dev-dependencies] 20[dev-dependencies]
20test_utils = { path = "../test_utils" } 21test_utils = { path = "../test_utils" }
diff --git a/crates/ra_mbe/src/lib.rs b/crates/mbe/src/lib.rs
index f854ca09a..f854ca09a 100644
--- a/crates/ra_mbe/src/lib.rs
+++ b/crates/mbe/src/lib.rs
diff --git a/crates/ra_mbe/src/mbe_expander.rs b/crates/mbe/src/mbe_expander.rs
index 1ad8b9f8a..1ad8b9f8a 100644
--- a/crates/ra_mbe/src/mbe_expander.rs
+++ b/crates/mbe/src/mbe_expander.rs
diff --git a/crates/ra_mbe/src/mbe_expander/matcher.rs b/crates/mbe/src/mbe_expander/matcher.rs
index b698b9832..b698b9832 100644
--- a/crates/ra_mbe/src/mbe_expander/matcher.rs
+++ b/crates/mbe/src/mbe_expander/matcher.rs
diff --git a/crates/ra_mbe/src/mbe_expander/transcriber.rs b/crates/mbe/src/mbe_expander/transcriber.rs
index c9525c5bf..c9525c5bf 100644
--- a/crates/ra_mbe/src/mbe_expander/transcriber.rs
+++ b/crates/mbe/src/mbe_expander/transcriber.rs
diff --git a/crates/ra_mbe/src/parser.rs b/crates/mbe/src/parser.rs
index 6b46a1673..6b46a1673 100644
--- a/crates/ra_mbe/src/parser.rs
+++ b/crates/mbe/src/parser.rs
diff --git a/crates/ra_mbe/src/subtree_source.rs b/crates/mbe/src/subtree_source.rs
index 41461b315..41461b315 100644
--- a/crates/ra_mbe/src/subtree_source.rs
+++ b/crates/mbe/src/subtree_source.rs
diff --git a/crates/ra_mbe/src/syntax_bridge.rs b/crates/mbe/src/syntax_bridge.rs
index a8ad917fb..a8ad917fb 100644
--- a/crates/ra_mbe/src/syntax_bridge.rs
+++ b/crates/mbe/src/syntax_bridge.rs
diff --git a/crates/ra_mbe/src/tests.rs b/crates/mbe/src/tests.rs
index 0796ceee1..0796ceee1 100644
--- a/crates/ra_mbe/src/tests.rs
+++ b/crates/mbe/src/tests.rs
diff --git a/crates/ra_mbe/src/tt_iter.rs b/crates/mbe/src/tt_iter.rs
index 46c420718..46c420718 100644
--- a/crates/ra_mbe/src/tt_iter.rs
+++ b/crates/mbe/src/tt_iter.rs
diff --git a/crates/proc_macro_srv/Cargo.toml b/crates/proc_macro_srv/Cargo.toml
index f7d481cba..0954ffb66 100644
--- a/crates/proc_macro_srv/Cargo.toml
+++ b/crates/proc_macro_srv/Cargo.toml
@@ -14,7 +14,7 @@ libloading = "0.6.0"
14memmap = "0.7" 14memmap = "0.7"
15 15
16tt = { path = "../tt" } 16tt = { path = "../tt" }
17ra_mbe = { path = "../ra_mbe" } 17mbe = { path = "../mbe" }
18ra_proc_macro = { path = "../ra_proc_macro" } 18ra_proc_macro = { path = "../ra_proc_macro" }
19test_utils = { path = "../test_utils" } 19test_utils = { path = "../test_utils" }
20 20
diff --git a/crates/proc_macro_srv/src/rustc_server.rs b/crates/proc_macro_srv/src/rustc_server.rs
index d534d1337..7d1695c86 100644
--- a/crates/proc_macro_srv/src/rustc_server.rs
+++ b/crates/proc_macro_srv/src/rustc_server.rs
@@ -182,7 +182,7 @@ pub mod token_stream {
182 182
183 fn from_str(src: &str) -> Result<TokenStream, LexError> { 183 fn from_str(src: &str) -> Result<TokenStream, LexError> {
184 let (subtree, _token_map) = 184 let (subtree, _token_map) =
185 ra_mbe::parse_to_token_tree(src).ok_or("Failed to parse from mbe")?; 185 mbe::parse_to_token_tree(src).ok_or("Failed to parse from mbe")?;
186 186
187 let tt: tt::TokenTree = subtree.into(); 187 let tt: tt::TokenTree = subtree.into();
188 Ok(tt.into()) 188 Ok(tt.into())
diff --git a/crates/ra_cfg/Cargo.toml b/crates/ra_cfg/Cargo.toml
index cb0d2b9d7..e77c7bd72 100644
--- a/crates/ra_cfg/Cargo.toml
+++ b/crates/ra_cfg/Cargo.toml
@@ -15,4 +15,4 @@ syntax = { path = "../syntax" }
15tt = { path = "../tt" } 15tt = { path = "../tt" }
16 16
17[dev-dependencies] 17[dev-dependencies]
18mbe = { path = "../ra_mbe", package = "ra_mbe" } 18mbe = { path = "../mbe" }
diff --git a/crates/ra_cfg/src/cfg_expr.rs b/crates/ra_cfg/src/cfg_expr.rs
index 940091465..fc93730d9 100644
--- a/crates/ra_cfg/src/cfg_expr.rs
+++ b/crates/ra_cfg/src/cfg_expr.rs
@@ -4,7 +4,7 @@
4 4
5use std::slice::Iter as SliceIter; 5use std::slice::Iter as SliceIter;
6 6
7use syntax::SmolStr; 7use tt::SmolStr;
8 8
9#[derive(Debug, Clone, PartialEq, Eq)] 9#[derive(Debug, Clone, PartialEq, Eq)]
10pub enum CfgExpr { 10pub enum CfgExpr {
diff --git a/crates/ra_hir_def/Cargo.toml b/crates/ra_hir_def/Cargo.toml
index 38129782f..ba7916c30 100644
--- a/crates/ra_hir_def/Cargo.toml
+++ b/crates/ra_hir_def/Cargo.toml
@@ -28,7 +28,7 @@ syntax = { path = "../syntax" }
28profile = { path = "../profile" } 28profile = { path = "../profile" }
29hir_expand = { path = "../ra_hir_expand", package = "ra_hir_expand" } 29hir_expand = { path = "../ra_hir_expand", package = "ra_hir_expand" }
30test_utils = { path = "../test_utils" } 30test_utils = { path = "../test_utils" }
31mbe = { path = "../ra_mbe", package = "ra_mbe" } 31mbe = { path = "../mbe" }
32ra_cfg = { path = "../ra_cfg" } 32ra_cfg = { path = "../ra_cfg" }
33tt = { path = "../tt" } 33tt = { path = "../tt" }
34 34
diff --git a/crates/ra_hir_expand/Cargo.toml b/crates/ra_hir_expand/Cargo.toml
index 153a70bdf..cbb0ac29b 100644
--- a/crates/ra_hir_expand/Cargo.toml
+++ b/crates/ra_hir_expand/Cargo.toml
@@ -19,5 +19,5 @@ syntax = { path = "../syntax" }
19parser = { path = "../parser" } 19parser = { path = "../parser" }
20profile = { path = "../profile" } 20profile = { path = "../profile" }
21tt = { path = "../tt" } 21tt = { path = "../tt" }
22mbe = { path = "../ra_mbe", package = "ra_mbe" } 22mbe = { path = "../mbe" }
23test_utils = { path = "../test_utils"} 23test_utils = { path = "../test_utils"}
diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml
index 7713ed7ea..156f8d538 100644
--- a/crates/rust-analyzer/Cargo.toml
+++ b/crates/rust-analyzer/Cargo.toml
@@ -60,5 +60,5 @@ winapi = "0.3.8"
60[dev-dependencies] 60[dev-dependencies]
61expect = { path = "../expect" } 61expect = { path = "../expect" }
62test_utils = { path = "../test_utils" } 62test_utils = { path = "../test_utils" }
63mbe = { path = "../ra_mbe", package = "ra_mbe" } 63mbe = { path = "../mbe" }
64tt = { path = "../tt" } 64tt = { path = "../tt" }
diff --git a/xtask/tests/tidy.rs b/xtask/tests/tidy.rs
index 8c608284a..0188aaa2e 100644
--- a/xtask/tests/tidy.rs
+++ b/xtask/tests/tidy.rs
@@ -195,7 +195,7 @@ impl TidyDocs {
195 "ra_hir", 195 "ra_hir",
196 "ra_hir_expand", 196 "ra_hir_expand",
197 "ra_ide", 197 "ra_ide",
198 "ra_mbe", 198 "mbe",
199 "parser", 199 "parser",
200 "profile", 200 "profile",
201 "ra_project_model", 201 "ra_project_model",