aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cargo.lock17
-rw-r--r--crates/ra_batch/Cargo.toml4
-rw-r--r--crates/ra_cli/Cargo.toml1
-rw-r--r--crates/ra_db/Cargo.toml2
-rw-r--r--crates/ra_hir/Cargo.toml2
-rw-r--r--crates/ra_lsp_server/Cargo.toml1
-rw-r--r--crates/ra_project_model/Cargo.toml5
-rw-r--r--crates/ra_syntax/Cargo.toml3
-rw-r--r--crates/test_utils/Cargo.toml1
9 files changed, 0 insertions, 36 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 3049ab3d9..e42a564db 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1096,10 +1096,8 @@ dependencies = [
1096 "ra_hir 0.1.0", 1096 "ra_hir 0.1.0",
1097 "ra_ide_api 0.1.0", 1097 "ra_ide_api 0.1.0",
1098 "ra_project_model 0.1.0", 1098 "ra_project_model 0.1.0",
1099 "ra_syntax 0.1.0",
1100 "ra_vfs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", 1099 "ra_vfs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
1101 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", 1100 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
1102 "test_utils 0.1.0",
1103] 1101]
1104 1102
1105[[package]] 1103[[package]]
@@ -1109,7 +1107,6 @@ dependencies = [
1109 "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", 1107 "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
1110 "flexi_logger 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)", 1108 "flexi_logger 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)",
1111 "indicatif 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", 1109 "indicatif 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
1112 "join_to_string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
1113 "ra_batch 0.1.0", 1110 "ra_batch 0.1.0",
1114 "ra_db 0.1.0", 1111 "ra_db 0.1.0",
1115 "ra_hir 0.1.0", 1112 "ra_hir 0.1.0",
@@ -1122,13 +1119,11 @@ dependencies = [
1122name = "ra_db" 1119name = "ra_db"
1123version = "0.1.0" 1120version = "0.1.0"
1124dependencies = [ 1121dependencies = [
1125 "ra_arena 0.1.0",
1126 "ra_prof 0.1.0", 1122 "ra_prof 0.1.0",
1127 "ra_syntax 0.1.0", 1123 "ra_syntax 0.1.0",
1128 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", 1124 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
1129 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", 1125 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
1130 "salsa 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", 1126 "salsa 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
1131 "test_utils 0.1.0",
1132] 1127]
1133 1128
1134[[package]] 1129[[package]]
@@ -1148,9 +1143,7 @@ dependencies = [
1148 "chalk-rust-ir 0.1.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)", 1143 "chalk-rust-ir 0.1.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)",
1149 "chalk-solve 0.1.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)", 1144 "chalk-solve 0.1.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)",
1150 "ena 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", 1145 "ena 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
1151 "flexi_logger 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)",
1152 "insta 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", 1146 "insta 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
1153 "join_to_string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
1154 "lalrpop-intern 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)", 1147 "lalrpop-intern 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)",
1155 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", 1148 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
1156 "once_cell 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", 1149 "once_cell 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1202,7 +1195,6 @@ dependencies = [
1202 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", 1195 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
1203 "lsp-types 0.59.0 (registry+https://github.com/rust-lang/crates.io-index)", 1196 "lsp-types 0.59.0 (registry+https://github.com/rust-lang/crates.io-index)",
1204 "parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", 1197 "parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
1205 "ra_arena 0.1.0",
1206 "ra_ide_api 0.1.0", 1198 "ra_ide_api 0.1.0",
1207 "ra_prof 0.1.0", 1199 "ra_prof 0.1.0",
1208 "ra_project_model 0.1.0", 1200 "ra_project_model 0.1.0",
@@ -1264,23 +1256,18 @@ dependencies = [
1264 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", 1256 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
1265 "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)", 1257 "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)",
1266 "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", 1258 "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
1267 "test_utils 0.1.0",
1268 "walkdir 2.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
1269] 1259]
1270 1260
1271[[package]] 1261[[package]]
1272name = "ra_syntax" 1262name = "ra_syntax"
1273version = "0.1.0" 1263version = "0.1.0"
1274dependencies = [ 1264dependencies = [
1275 "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
1276 "drop_bomb 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
1277 "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", 1265 "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
1278 "ra_parser 0.1.0", 1266 "ra_parser 0.1.0",
1279 "ra_text_edit 0.1.0", 1267 "ra_text_edit 0.1.0",
1280 "rowan 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", 1268 "rowan 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
1281 "smol_str 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", 1269 "smol_str 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
1282 "test_utils 0.1.0", 1270 "test_utils 0.1.0",
1283 "text_unit 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
1284 "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", 1271 "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
1285 "walkdir 2.2.8 (registry+https://github.com/rust-lang/crates.io-index)", 1272 "walkdir 2.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
1286] 1273]
@@ -1842,7 +1829,6 @@ name = "test_utils"
1842version = "0.1.0" 1829version = "0.1.0"
1843dependencies = [ 1830dependencies = [
1844 "difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", 1831 "difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
1845 "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
1846 "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", 1832 "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
1847 "text_unit 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", 1833 "text_unit 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
1848] 1834]
@@ -1851,9 +1837,6 @@ dependencies = [
1851name = "text_unit" 1837name = "text_unit"
1852version = "0.1.9" 1838version = "0.1.9"
1853source = "registry+https://github.com/rust-lang/crates.io-index" 1839source = "registry+https://github.com/rust-lang/crates.io-index"
1854dependencies = [
1855 "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)",
1856]
1857 1840
1858[[package]] 1841[[package]]
1859name = "textwrap" 1842name = "textwrap"
diff --git a/crates/ra_batch/Cargo.toml b/crates/ra_batch/Cargo.toml
index 7d8837fc3..0ee94c445 100644
--- a/crates/ra_batch/Cargo.toml
+++ b/crates/ra_batch/Cargo.toml
@@ -9,11 +9,7 @@ log = "0.4.5"
9rustc-hash = "1.0" 9rustc-hash = "1.0"
10 10
11ra_vfs = "0.2.0" 11ra_vfs = "0.2.0"
12ra_syntax = { path = "../ra_syntax" }
13ra_db = { path = "../ra_db" } 12ra_db = { path = "../ra_db" }
14ra_ide_api = { path = "../ra_ide_api" } 13ra_ide_api = { path = "../ra_ide_api" }
15ra_hir = { path = "../ra_hir" } 14ra_hir = { path = "../ra_hir" }
16ra_project_model = { path = "../ra_project_model" } 15ra_project_model = { path = "../ra_project_model" }
17
18[dev-dependencies]
19test_utils = { path = "../test_utils" }
diff --git a/crates/ra_cli/Cargo.toml b/crates/ra_cli/Cargo.toml
index 639b7c949..4d9c41ae9 100644
--- a/crates/ra_cli/Cargo.toml
+++ b/crates/ra_cli/Cargo.toml
@@ -7,7 +7,6 @@ publish = false
7 7
8[dependencies] 8[dependencies]
9clap = "2.32.0" 9clap = "2.32.0"
10join_to_string = "0.1.1"
11flexi_logger = "0.13.0" 10flexi_logger = "0.13.0"
12indicatif = "0.11.0" 11indicatif = "0.11.0"
13 12
diff --git a/crates/ra_db/Cargo.toml b/crates/ra_db/Cargo.toml
index f73dd739a..7a13c247b 100644
--- a/crates/ra_db/Cargo.toml
+++ b/crates/ra_db/Cargo.toml
@@ -9,7 +9,5 @@ salsa = "0.12.3"
9relative-path = "0.4.0" 9relative-path = "0.4.0"
10rustc-hash = "1.0" 10rustc-hash = "1.0"
11 11
12ra_arena = { path = "../ra_arena" }
13ra_syntax = { path = "../ra_syntax" } 12ra_syntax = { path = "../ra_syntax" }
14ra_prof = { path = "../ra_prof" } 13ra_prof = { path = "../ra_prof" }
15test_utils = { path = "../test_utils" }
diff --git a/crates/ra_hir/Cargo.toml b/crates/ra_hir/Cargo.toml
index e44e144d6..de2c2dbec 100644
--- a/crates/ra_hir/Cargo.toml
+++ b/crates/ra_hir/Cargo.toml
@@ -11,7 +11,6 @@ relative-path = "0.4.0"
11rustc-hash = "1.0" 11rustc-hash = "1.0"
12parking_lot = "0.8.0" 12parking_lot = "0.8.0"
13ena = "0.13" 13ena = "0.13"
14join_to_string = "0.1.3"
15once_cell = "0.2" 14once_cell = "0.2"
16 15
17ra_syntax = { path = "../ra_syntax" } 16ra_syntax = { path = "../ra_syntax" }
@@ -28,5 +27,4 @@ chalk-ir = { git = "https://github.com/flodiebold/chalk.git", branch = "fuel" }
28lalrpop-intern = "0.15.1" 27lalrpop-intern = "0.15.1"
29 28
30[dev-dependencies] 29[dev-dependencies]
31flexi_logger = "0.13.0"
32insta = "0.8.1" 30insta = "0.8.1"
diff --git a/crates/ra_lsp_server/Cargo.toml b/crates/ra_lsp_server/Cargo.toml
index 50bc8111b..753710931 100644
--- a/crates/ra_lsp_server/Cargo.toml
+++ b/crates/ra_lsp_server/Cargo.toml
@@ -22,7 +22,6 @@ thread_worker = { path = "../thread_worker" }
22ra_syntax = { path = "../ra_syntax" } 22ra_syntax = { path = "../ra_syntax" }
23ra_text_edit = { path = "../ra_text_edit" } 23ra_text_edit = { path = "../ra_text_edit" }
24ra_ide_api = { path = "../ra_ide_api" } 24ra_ide_api = { path = "../ra_ide_api" }
25ra_arena = { path = "../ra_arena" }
26gen_lsp_server = { path = "../gen_lsp_server" } 25gen_lsp_server = { path = "../gen_lsp_server" }
27ra_project_model = { path = "../ra_project_model" } 26ra_project_model = { path = "../ra_project_model" }
28ra_prof = { path = "../ra_prof" } 27ra_prof = { path = "../ra_prof" }
diff --git a/crates/ra_project_model/Cargo.toml b/crates/ra_project_model/Cargo.toml
index a1f7bf6dc..3545d23c9 100644
--- a/crates/ra_project_model/Cargo.toml
+++ b/crates/ra_project_model/Cargo.toml
@@ -9,8 +9,6 @@ log = "0.4.5"
9rustc-hash = "1.0" 9rustc-hash = "1.0"
10relative-path = "0.4.0" 10relative-path = "0.4.0"
11 11
12walkdir = "2.2.7"
13
14cargo_metadata = "0.8.0" 12cargo_metadata = "0.8.0"
15 13
16ra_arena = { path = "../ra_arena" } 14ra_arena = { path = "../ra_arena" }
@@ -18,6 +16,3 @@ ra_db = { path = "../ra_db" }
18 16
19serde = { version = "1.0.89", features = ["derive"] } 17serde = { version = "1.0.89", features = ["derive"] }
20serde_json = "1.0.39" 18serde_json = "1.0.39"
21
22[dev-dependencies]
23test_utils = { path = "../test_utils" }
diff --git a/crates/ra_syntax/Cargo.toml b/crates/ra_syntax/Cargo.toml
index 156991358..37a91ea35 100644
--- a/crates/ra_syntax/Cargo.toml
+++ b/crates/ra_syntax/Cargo.toml
@@ -8,15 +8,12 @@ description = "Comment and whitespace preserving parser for the Rust langauge"
8repository = "https://github.com/rust-analyzer/rust-analyzer" 8repository = "https://github.com/rust-analyzer/rust-analyzer"
9 9
10[dependencies] 10[dependencies]
11arrayvec = "0.4.10"
12unicode-xid = "0.1.0" 11unicode-xid = "0.1.0"
13itertools = "0.8.0" 12itertools = "0.8.0"
14drop_bomb = "0.1.4"
15rowan = "0.5.0" 13rowan = "0.5.0"
16 14
17# ideally, `serde` should be enabled by `ra_lsp_server`, but we enable it here 15# ideally, `serde` should be enabled by `ra_lsp_server`, but we enable it here
18# to reduce number of compilations 16# to reduce number of compilations
19text_unit = { version = "0.1.8", features = ["serde"] }
20smol_str = { version = "0.1.12", features = ["serde"] } 17smol_str = { version = "0.1.12", features = ["serde"] }
21 18
22ra_text_edit = { path = "../ra_text_edit" } 19ra_text_edit = { path = "../ra_text_edit" }
diff --git a/crates/test_utils/Cargo.toml b/crates/test_utils/Cargo.toml
index b58dbd1cf..0be9c3665 100644
--- a/crates/test_utils/Cargo.toml
+++ b/crates/test_utils/Cargo.toml
@@ -6,6 +6,5 @@ authors = ["rust-analyzer developers"]
6 6
7[dependencies] 7[dependencies]
8difference = "2.0.0" 8difference = "2.0.0"
9itertools = "0.8.0"
10text_unit = "0.1.2" 9text_unit = "0.1.2"
11serde_json = "1.0.34" 10serde_json = "1.0.34"