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