aboutsummaryrefslogtreecommitdiff
path: root/Cargo.lock
diff options
context:
space:
mode:
Diffstat (limited to 'Cargo.lock')
-rw-r--r--Cargo.lock13
1 files changed, 13 insertions, 0 deletions
diff --git a/Cargo.lock b/Cargo.lock
index c2d00adeb..bed9acf8f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -967,6 +967,7 @@ dependencies = [
967 "crossbeam-channel", 967 "crossbeam-channel",
968 "jod-thread", 968 "jod-thread",
969 "log", 969 "log",
970 "ra_progress",
970 "ra_toolchain", 971 "ra_toolchain",
971 "serde_json", 972 "serde_json",
972] 973]
@@ -1080,7 +1081,11 @@ dependencies = [
1080 "ra_hir", 1081 "ra_hir",
1081 "ra_ide_db", 1082 "ra_ide_db",
1082 "ra_prof", 1083 "ra_prof",
1084<<<<<<< HEAD
1083 "ra_ssr", 1085 "ra_ssr",
1086=======
1087 "ra_progress",
1088>>>>>>> Veetaha-feat/sync-branch
1084 "ra_syntax", 1089 "ra_syntax",
1085 "ra_text_edit", 1090 "ra_text_edit",
1086 "rand", 1091 "rand",
@@ -1169,6 +1174,13 @@ dependencies = [
1169] 1174]
1170 1175
1171[[package]] 1176[[package]]
1177name = "ra_progress"
1178version = "0.1.0"
1179dependencies = [
1180 "crossbeam-channel",
1181]
1182
1183[[package]]
1172name = "ra_project_model" 1184name = "ra_project_model"
1173version = "0.1.0" 1185version = "0.1.0"
1174dependencies = [ 1186dependencies = [
@@ -1392,6 +1404,7 @@ dependencies = [
1392 "ra_mbe", 1404 "ra_mbe",
1393 "ra_proc_macro_srv", 1405 "ra_proc_macro_srv",
1394 "ra_prof", 1406 "ra_prof",
1407 "ra_progress",
1395 "ra_project_model", 1408 "ra_project_model",
1396 "ra_syntax", 1409 "ra_syntax",
1397 "ra_text_edit", 1410 "ra_text_edit",