diff options
Diffstat (limited to 'Cargo.lock')
-rw-r--r-- | Cargo.lock | 124 |
1 files changed, 73 insertions, 51 deletions
diff --git a/Cargo.lock b/Cargo.lock index 08e9c10d8..bed9acf8f 100644 --- a/Cargo.lock +++ b/Cargo.lock | |||
@@ -2,9 +2,9 @@ | |||
2 | # It is not intended for manual editing. | 2 | # It is not intended for manual editing. |
3 | [[package]] | 3 | [[package]] |
4 | name = "addr2line" | 4 | name = "addr2line" |
5 | version = "0.12.1" | 5 | version = "0.12.2" |
6 | source = "registry+https://github.com/rust-lang/crates.io-index" | 6 | source = "registry+https://github.com/rust-lang/crates.io-index" |
7 | checksum = "a49806b9dadc843c61e7c97e72490ad7f7220ae249012fbda9ad0609457c0543" | 7 | checksum = "602d785912f476e480434627e8732e6766b760c045bbf897d9dfaa9f4fbd399c" |
8 | dependencies = [ | 8 | dependencies = [ |
9 | "gimli", | 9 | "gimli", |
10 | ] | 10 | ] |
@@ -288,9 +288,9 @@ checksum = "69b26e475fd29098530e709294e94e661974c851aed42512793f120fed4e199f" | |||
288 | 288 | ||
289 | [[package]] | 289 | [[package]] |
290 | name = "dtoa" | 290 | name = "dtoa" |
291 | version = "0.4.5" | 291 | version = "0.4.6" |
292 | source = "registry+https://github.com/rust-lang/crates.io-index" | 292 | source = "registry+https://github.com/rust-lang/crates.io-index" |
293 | checksum = "4358a9e11b9a09cf52383b451b49a169e8d797b68aa02301ff586d70d9661ea3" | 293 | checksum = "134951f4028bdadb9b84baf4232681efbf277da25144b9b0ad65df75946c422b" |
294 | 294 | ||
295 | [[package]] | 295 | [[package]] |
296 | name = "either" | 296 | name = "either" |
@@ -354,9 +354,9 @@ checksum = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674" | |||
354 | 354 | ||
355 | [[package]] | 355 | [[package]] |
356 | name = "fsevent" | 356 | name = "fsevent" |
357 | version = "0.4.0" | 357 | version = "2.0.2" |
358 | source = "registry+https://github.com/rust-lang/crates.io-index" | 358 | source = "registry+https://github.com/rust-lang/crates.io-index" |
359 | checksum = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6" | 359 | checksum = "97f347202c95c98805c216f9e1df210e8ebaec9fdb2365700a43c10797a35e63" |
360 | dependencies = [ | 360 | dependencies = [ |
361 | "bitflags", | 361 | "bitflags", |
362 | "fsevent-sys", | 362 | "fsevent-sys", |
@@ -364,9 +364,9 @@ dependencies = [ | |||
364 | 364 | ||
365 | [[package]] | 365 | [[package]] |
366 | name = "fsevent-sys" | 366 | name = "fsevent-sys" |
367 | version = "2.0.1" | 367 | version = "3.0.2" |
368 | source = "registry+https://github.com/rust-lang/crates.io-index" | 368 | source = "registry+https://github.com/rust-lang/crates.io-index" |
369 | checksum = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0" | 369 | checksum = "77a29c77f1ca394c3e73a9a5d24cfcabb734682d9634fc398f2204a63c994120" |
370 | dependencies = [ | 370 | dependencies = [ |
371 | "libc", | 371 | "libc", |
372 | ] | 372 | ] |
@@ -483,9 +483,9 @@ dependencies = [ | |||
483 | 483 | ||
484 | [[package]] | 484 | [[package]] |
485 | name = "inotify" | 485 | name = "inotify" |
486 | version = "0.7.1" | 486 | version = "0.8.3" |
487 | source = "registry+https://github.com/rust-lang/crates.io-index" | 487 | source = "registry+https://github.com/rust-lang/crates.io-index" |
488 | checksum = "4816c66d2c8ae673df83366c18341538f234a26d65a9ecea5c348b453ac1d02f" | 488 | checksum = "46dd0a94b393c730779ccfd2a872b67b1eb67be3fc33082e733bdb38b5fde4d4" |
489 | dependencies = [ | 489 | dependencies = [ |
490 | "bitflags", | 490 | "bitflags", |
491 | "inotify-sys", | 491 | "inotify-sys", |
@@ -535,9 +535,9 @@ dependencies = [ | |||
535 | 535 | ||
536 | [[package]] | 536 | [[package]] |
537 | name = "itoa" | 537 | name = "itoa" |
538 | version = "0.4.5" | 538 | version = "0.4.6" |
539 | source = "registry+https://github.com/rust-lang/crates.io-index" | 539 | source = "registry+https://github.com/rust-lang/crates.io-index" |
540 | checksum = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e" | 540 | checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" |
541 | 541 | ||
542 | [[package]] | 542 | [[package]] |
543 | name = "jemalloc-ctl" | 543 | name = "jemalloc-ctl" |
@@ -640,9 +640,9 @@ dependencies = [ | |||
640 | 640 | ||
641 | [[package]] | 641 | [[package]] |
642 | name = "lsp-server" | 642 | name = "lsp-server" |
643 | version = "0.3.2" | 643 | version = "0.3.3" |
644 | source = "registry+https://github.com/rust-lang/crates.io-index" | 644 | source = "registry+https://github.com/rust-lang/crates.io-index" |
645 | checksum = "dccec31bfd027ac0dd288a78e19005fd89624d9099456e284b5241316a6c3072" | 645 | checksum = "53b4ace8ebe5d2aff3687ce0ed507f6020d6a47a7de2b0d3d664ea237ffb0c62" |
646 | dependencies = [ | 646 | dependencies = [ |
647 | "crossbeam-channel", | 647 | "crossbeam-channel", |
648 | "log", | 648 | "log", |
@@ -766,11 +766,13 @@ dependencies = [ | |||
766 | 766 | ||
767 | [[package]] | 767 | [[package]] |
768 | name = "notify" | 768 | name = "notify" |
769 | version = "4.0.15" | 769 | version = "5.0.0-pre.3" |
770 | source = "registry+https://github.com/rust-lang/crates.io-index" | 770 | source = "registry+https://github.com/rust-lang/crates.io-index" |
771 | checksum = "80ae4a7688d1fab81c5bf19c64fc8db920be8d519ce6336ed4e7efe024724dbd" | 771 | checksum = "77d03607cf88b4b160ba0e9ed425fff3cee3b55ac813f0c685b3a3772da37d0e" |
772 | dependencies = [ | 772 | dependencies = [ |
773 | "anymap", | ||
773 | "bitflags", | 774 | "bitflags", |
775 | "crossbeam-channel", | ||
774 | "filetime", | 776 | "filetime", |
775 | "fsevent", | 777 | "fsevent", |
776 | "fsevent-sys", | 778 | "fsevent-sys", |
@@ -830,9 +832,9 @@ dependencies = [ | |||
830 | 832 | ||
831 | [[package]] | 833 | [[package]] |
832 | name = "paste" | 834 | name = "paste" |
833 | version = "0.1.17" | 835 | version = "0.1.18" |
834 | source = "registry+https://github.com/rust-lang/crates.io-index" | 836 | source = "registry+https://github.com/rust-lang/crates.io-index" |
835 | checksum = "026c63fe245362be0322bfec5a9656d458d13f9cfb1785d1b38458b9968e8080" | 837 | checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" |
836 | dependencies = [ | 838 | dependencies = [ |
837 | "paste-impl", | 839 | "paste-impl", |
838 | "proc-macro-hack", | 840 | "proc-macro-hack", |
@@ -840,9 +842,9 @@ dependencies = [ | |||
840 | 842 | ||
841 | [[package]] | 843 | [[package]] |
842 | name = "paste-impl" | 844 | name = "paste-impl" |
843 | version = "0.1.17" | 845 | version = "0.1.18" |
844 | source = "registry+https://github.com/rust-lang/crates.io-index" | 846 | source = "registry+https://github.com/rust-lang/crates.io-index" |
845 | checksum = "7b9281a268ec213237dcd2aa3c3d0f46681b04ced37c1616fd36567a9e6954b0" | 847 | checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" |
846 | dependencies = [ | 848 | dependencies = [ |
847 | "proc-macro-hack", | 849 | "proc-macro-hack", |
848 | ] | 850 | ] |
@@ -952,7 +954,9 @@ dependencies = [ | |||
952 | "relative-path", | 954 | "relative-path", |
953 | "rustc-hash", | 955 | "rustc-hash", |
954 | "salsa", | 956 | "salsa", |
957 | "stdx", | ||
955 | "test_utils", | 958 | "test_utils", |
959 | "vfs", | ||
956 | ] | 960 | ] |
957 | 961 | ||
958 | [[package]] | 962 | [[package]] |
@@ -1015,6 +1019,7 @@ dependencies = [ | |||
1015 | "ra_syntax", | 1019 | "ra_syntax", |
1016 | "ra_tt", | 1020 | "ra_tt", |
1017 | "rustc-hash", | 1021 | "rustc-hash", |
1022 | "smallvec", | ||
1018 | "stdx", | 1023 | "stdx", |
1019 | "test_utils", | 1024 | "test_utils", |
1020 | ] | 1025 | ] |
@@ -1076,7 +1081,11 @@ dependencies = [ | |||
1076 | "ra_hir", | 1081 | "ra_hir", |
1077 | "ra_ide_db", | 1082 | "ra_ide_db", |
1078 | "ra_prof", | 1083 | "ra_prof", |
1084 | <<<<<<< HEAD | ||
1085 | "ra_ssr", | ||
1086 | ======= | ||
1079 | "ra_progress", | 1087 | "ra_progress", |
1088 | >>>>>>> Veetaha-feat/sync-branch | ||
1080 | "ra_syntax", | 1089 | "ra_syntax", |
1081 | "ra_text_edit", | 1090 | "ra_text_edit", |
1082 | "rand", | 1091 | "rand", |
@@ -1178,6 +1187,7 @@ dependencies = [ | |||
1178 | "anyhow", | 1187 | "anyhow", |
1179 | "cargo_metadata", | 1188 | "cargo_metadata", |
1180 | "log", | 1189 | "log", |
1190 | "paths", | ||
1181 | "ra_arena", | 1191 | "ra_arena", |
1182 | "ra_cfg", | 1192 | "ra_cfg", |
1183 | "ra_db", | 1193 | "ra_db", |
@@ -1186,6 +1196,19 @@ dependencies = [ | |||
1186 | "rustc-hash", | 1196 | "rustc-hash", |
1187 | "serde", | 1197 | "serde", |
1188 | "serde_json", | 1198 | "serde_json", |
1199 | "stdx", | ||
1200 | ] | ||
1201 | |||
1202 | [[package]] | ||
1203 | name = "ra_ssr" | ||
1204 | version = "0.1.0" | ||
1205 | dependencies = [ | ||
1206 | "ra_db", | ||
1207 | "ra_hir", | ||
1208 | "ra_ide_db", | ||
1209 | "ra_syntax", | ||
1210 | "ra_text_edit", | ||
1211 | "rustc-hash", | ||
1189 | ] | 1212 | ] |
1190 | 1213 | ||
1191 | [[package]] | 1214 | [[package]] |
@@ -1229,22 +1252,6 @@ dependencies = [ | |||
1229 | ] | 1252 | ] |
1230 | 1253 | ||
1231 | [[package]] | 1254 | [[package]] |
1232 | name = "ra_vfs" | ||
1233 | version = "0.6.1" | ||
1234 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
1235 | checksum = "cbf31a173fc77ec59c27cf39af6baa137b40f4dbd45a8b3eccb1b2e4cfc922c1" | ||
1236 | dependencies = [ | ||
1237 | "crossbeam-channel", | ||
1238 | "jod-thread", | ||
1239 | "log", | ||
1240 | "notify", | ||
1241 | "parking_lot", | ||
1242 | "relative-path", | ||
1243 | "rustc-hash", | ||
1244 | "walkdir", | ||
1245 | ] | ||
1246 | |||
1247 | [[package]] | ||
1248 | name = "rand" | 1255 | name = "rand" |
1249 | version = "0.7.3" | 1256 | version = "0.7.3" |
1250 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1257 | source = "registry+https://github.com/rust-lang/crates.io-index" |
@@ -1402,9 +1409,7 @@ dependencies = [ | |||
1402 | "ra_syntax", | 1409 | "ra_syntax", |
1403 | "ra_text_edit", | 1410 | "ra_text_edit", |
1404 | "ra_tt", | 1411 | "ra_tt", |
1405 | "ra_vfs", | ||
1406 | "rand", | 1412 | "rand", |
1407 | "relative-path", | ||
1408 | "rustc-hash", | 1413 | "rustc-hash", |
1409 | "serde", | 1414 | "serde", |
1410 | "serde_json", | 1415 | "serde_json", |
@@ -1412,6 +1417,8 @@ dependencies = [ | |||
1412 | "tempfile", | 1417 | "tempfile", |
1413 | "test_utils", | 1418 | "test_utils", |
1414 | "threadpool", | 1419 | "threadpool", |
1420 | "vfs", | ||
1421 | "vfs-notify", | ||
1415 | "winapi 0.3.8", | 1422 | "winapi 0.3.8", |
1416 | ] | 1423 | ] |
1417 | 1424 | ||
@@ -1529,18 +1536,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" | |||
1529 | 1536 | ||
1530 | [[package]] | 1537 | [[package]] |
1531 | name = "serde" | 1538 | name = "serde" |
1532 | version = "1.0.112" | 1539 | version = "1.0.113" |
1533 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1540 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1534 | checksum = "736aac72d1eafe8e5962d1d1c3d99b0df526015ba40915cb3c49d042e92ec243" | 1541 | checksum = "6135c78461981c79497158ef777264c51d9d0f4f3fc3a4d22b915900e42dac6a" |
1535 | dependencies = [ | 1542 | dependencies = [ |
1536 | "serde_derive", | 1543 | "serde_derive", |
1537 | ] | 1544 | ] |
1538 | 1545 | ||
1539 | [[package]] | 1546 | [[package]] |
1540 | name = "serde_derive" | 1547 | name = "serde_derive" |
1541 | version = "1.0.112" | 1548 | version = "1.0.113" |
1542 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1549 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1543 | checksum = "bf0343ce212ac0d3d6afd9391ac8e9c9efe06b533c8d33f660f6390cc4093f57" | 1550 | checksum = "93c5eaa17d0954cb481cdcfffe9d84fcfa7a1a9f2349271e678677be4c26ae31" |
1544 | dependencies = [ | 1551 | dependencies = [ |
1545 | "proc-macro2", | 1552 | "proc-macro2", |
1546 | "quote", | 1553 | "quote", |
@@ -1560,9 +1567,9 @@ dependencies = [ | |||
1560 | 1567 | ||
1561 | [[package]] | 1568 | [[package]] |
1562 | name = "serde_repr" | 1569 | name = "serde_repr" |
1563 | version = "0.1.5" | 1570 | version = "0.1.6" |
1564 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1571 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1565 | checksum = "cd02c7587ec314570041b2754829f84d873ced14a96d1fd1823531e11db40573" | 1572 | checksum = "2dc6b7951b17b051f3210b063f12cc17320e2fe30ae05b0fe2a3abb068551c76" |
1566 | dependencies = [ | 1573 | dependencies = [ |
1567 | "proc-macro2", | 1574 | "proc-macro2", |
1568 | "quote", | 1575 | "quote", |
@@ -1614,9 +1621,9 @@ checksum = "ab16ced94dbd8a46c82fd81e3ed9a8727dac2977ea869d217bcc4ea1f122e81f" | |||
1614 | 1621 | ||
1615 | [[package]] | 1622 | [[package]] |
1616 | name = "syn" | 1623 | name = "syn" |
1617 | version = "1.0.31" | 1624 | version = "1.0.32" |
1618 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1625 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1619 | checksum = "b5304cfdf27365b7585c25d4af91b35016ed21ef88f17ced89c7093b43dba8b6" | 1626 | checksum = "a994520748611c17d163e81b6c4a4b13d11b7f63884362ab2efac3aa9cf16d00" |
1620 | dependencies = [ | 1627 | dependencies = [ |
1621 | "proc-macro2", | 1628 | "proc-macro2", |
1622 | "quote", | 1629 | "quote", |
@@ -1673,8 +1680,6 @@ name = "test_utils" | |||
1673 | version = "0.1.0" | 1680 | version = "0.1.0" |
1674 | dependencies = [ | 1681 | dependencies = [ |
1675 | "difference", | 1682 | "difference", |
1676 | "ra_cfg", | ||
1677 | "relative-path", | ||
1678 | "rustc-hash", | 1683 | "rustc-hash", |
1679 | "serde_json", | 1684 | "serde_json", |
1680 | "stdx", | 1685 | "stdx", |
@@ -1712,6 +1717,12 @@ dependencies = [ | |||
1712 | ] | 1717 | ] |
1713 | 1718 | ||
1714 | [[package]] | 1719 | [[package]] |
1720 | name = "tinyvec" | ||
1721 | version = "0.3.3" | ||
1722 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
1723 | checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed" | ||
1724 | |||
1725 | [[package]] | ||
1715 | name = "unicode-bidi" | 1726 | name = "unicode-bidi" |
1716 | version = "0.3.4" | 1727 | version = "0.3.4" |
1717 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1728 | source = "registry+https://github.com/rust-lang/crates.io-index" |
@@ -1722,11 +1733,11 @@ dependencies = [ | |||
1722 | 1733 | ||
1723 | [[package]] | 1734 | [[package]] |
1724 | name = "unicode-normalization" | 1735 | name = "unicode-normalization" |
1725 | version = "0.1.12" | 1736 | version = "0.1.13" |
1726 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1737 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1727 | checksum = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4" | 1738 | checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977" |
1728 | dependencies = [ | 1739 | dependencies = [ |
1729 | "smallvec", | 1740 | "tinyvec", |
1730 | ] | 1741 | ] |
1731 | 1742 | ||
1732 | [[package]] | 1743 | [[package]] |
@@ -1757,11 +1768,22 @@ dependencies = [ | |||
1757 | name = "vfs" | 1768 | name = "vfs" |
1758 | version = "0.1.0" | 1769 | version = "0.1.0" |
1759 | dependencies = [ | 1770 | dependencies = [ |
1771 | "paths", | ||
1772 | "rustc-hash", | ||
1773 | ] | ||
1774 | |||
1775 | [[package]] | ||
1776 | name = "vfs-notify" | ||
1777 | version = "0.1.0" | ||
1778 | dependencies = [ | ||
1760 | "crossbeam-channel", | 1779 | "crossbeam-channel", |
1761 | "globset", | 1780 | "globset", |
1762 | "jod-thread", | 1781 | "jod-thread", |
1782 | "log", | ||
1783 | "notify", | ||
1763 | "paths", | 1784 | "paths", |
1764 | "rustc-hash", | 1785 | "rustc-hash", |
1786 | "vfs", | ||
1765 | "walkdir", | 1787 | "walkdir", |
1766 | ] | 1788 | ] |
1767 | 1789 | ||