diff options
author | Mikhail Rakhmanov <[email protected]> | 2020-06-13 07:42:15 +0100 |
---|---|---|
committer | Mikhail Rakhmanov <[email protected]> | 2020-06-13 07:42:15 +0100 |
commit | 16bbf4ab7f132e6e5e5318dccdef9a5d71afdd7f (patch) | |
tree | 4b79fa8c046be56b02427ba843e70cdf3ac05767 /Cargo.lock | |
parent | eeb8b9e236796da8734ba81a49164864497f7226 (diff) | |
parent | b56ad148db0c69eb279c225f45d324b4e80e7367 (diff) |
Merge branch 'master' into keyword_completion
# Conflicts:
# docs/user/generated_features.adoc
Diffstat (limited to 'Cargo.lock')
-rw-r--r-- | Cargo.lock | 83 |
1 files changed, 47 insertions, 36 deletions
diff --git a/Cargo.lock b/Cargo.lock index 9981a2e33..308e36836 100644 --- a/Cargo.lock +++ b/Cargo.lock | |||
@@ -113,8 +113,9 @@ checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" | |||
113 | 113 | ||
114 | [[package]] | 114 | [[package]] |
115 | name = "chalk-derive" | 115 | name = "chalk-derive" |
116 | version = "0.10.1-dev" | 116 | version = "0.11.0" |
117 | source = "git+https://github.com/rust-lang/chalk.git?rev=329b7f3fdd2431ed6f6778cde53f22374c7d094c#329b7f3fdd2431ed6f6778cde53f22374c7d094c" | 117 | source = "registry+https://github.com/rust-lang/crates.io-index" |
118 | checksum = "5b9bd01eab87277d973183a1d2e56bace1c11f8242c52c20636fb7dddf343ac9" | ||
118 | dependencies = [ | 119 | dependencies = [ |
119 | "proc-macro2", | 120 | "proc-macro2", |
120 | "quote", | 121 | "quote", |
@@ -124,8 +125,9 @@ dependencies = [ | |||
124 | 125 | ||
125 | [[package]] | 126 | [[package]] |
126 | name = "chalk-engine" | 127 | name = "chalk-engine" |
127 | version = "0.10.1-dev" | 128 | version = "0.11.0" |
128 | source = "git+https://github.com/rust-lang/chalk.git?rev=329b7f3fdd2431ed6f6778cde53f22374c7d094c#329b7f3fdd2431ed6f6778cde53f22374c7d094c" | 129 | source = "registry+https://github.com/rust-lang/crates.io-index" |
130 | checksum = "6c7a637c3d17ed555aef16e16952a5d1e127bd55178cc30be22afeb92da90c7d" | ||
129 | dependencies = [ | 131 | dependencies = [ |
130 | "chalk-derive", | 132 | "chalk-derive", |
131 | "chalk-ir", | 133 | "chalk-ir", |
@@ -134,8 +136,9 @@ dependencies = [ | |||
134 | 136 | ||
135 | [[package]] | 137 | [[package]] |
136 | name = "chalk-ir" | 138 | name = "chalk-ir" |
137 | version = "0.10.1-dev" | 139 | version = "0.11.0" |
138 | source = "git+https://github.com/rust-lang/chalk.git?rev=329b7f3fdd2431ed6f6778cde53f22374c7d094c#329b7f3fdd2431ed6f6778cde53f22374c7d094c" | 140 | source = "registry+https://github.com/rust-lang/crates.io-index" |
141 | checksum = "595e5735ded16c3f3dc348f7b15bbb2521a0080b1863cac38ad5271589944670" | ||
139 | dependencies = [ | 142 | dependencies = [ |
140 | "chalk-derive", | 143 | "chalk-derive", |
141 | "lazy_static", | 144 | "lazy_static", |
@@ -143,8 +146,9 @@ dependencies = [ | |||
143 | 146 | ||
144 | [[package]] | 147 | [[package]] |
145 | name = "chalk-solve" | 148 | name = "chalk-solve" |
146 | version = "0.10.1-dev" | 149 | version = "0.11.0" |
147 | source = "git+https://github.com/rust-lang/chalk.git?rev=329b7f3fdd2431ed6f6778cde53f22374c7d094c#329b7f3fdd2431ed6f6778cde53f22374c7d094c" | 150 | source = "registry+https://github.com/rust-lang/crates.io-index" |
151 | checksum = "5d9d938139db425867a30cc0cfec0269406d8238d0571d829041eaa7a8455d11" | ||
148 | dependencies = [ | 152 | dependencies = [ |
149 | "chalk-derive", | 153 | "chalk-derive", |
150 | "chalk-engine", | 154 | "chalk-engine", |
@@ -243,12 +247,13 @@ dependencies = [ | |||
243 | 247 | ||
244 | [[package]] | 248 | [[package]] |
245 | name = "crossbeam-queue" | 249 | name = "crossbeam-queue" |
246 | version = "0.2.2" | 250 | version = "0.2.3" |
247 | source = "registry+https://github.com/rust-lang/crates.io-index" | 251 | source = "registry+https://github.com/rust-lang/crates.io-index" |
248 | checksum = "ab6bffe714b6bb07e42f201352c34f51fefd355ace793f9e638ebd52d23f98d2" | 252 | checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" |
249 | dependencies = [ | 253 | dependencies = [ |
250 | "cfg-if", | 254 | "cfg-if", |
251 | "crossbeam-utils", | 255 | "crossbeam-utils", |
256 | "maybe-uninit", | ||
252 | ] | 257 | ] |
253 | 258 | ||
254 | [[package]] | 259 | [[package]] |
@@ -462,18 +467,18 @@ dependencies = [ | |||
462 | 467 | ||
463 | [[package]] | 468 | [[package]] |
464 | name = "indexmap" | 469 | name = "indexmap" |
465 | version = "1.3.2" | 470 | version = "1.4.0" |
466 | source = "registry+https://github.com/rust-lang/crates.io-index" | 471 | source = "registry+https://github.com/rust-lang/crates.io-index" |
467 | checksum = "076f042c5b7b98f31d205f1249267e12a6518c1481e9dae9764af19b707d2292" | 472 | checksum = "c398b2b113b55809ceb9ee3e753fcbac793f1956663f3c36549c1346015c2afe" |
468 | dependencies = [ | 473 | dependencies = [ |
469 | "autocfg", | 474 | "autocfg", |
470 | ] | 475 | ] |
471 | 476 | ||
472 | [[package]] | 477 | [[package]] |
473 | name = "inotify" | 478 | name = "inotify" |
474 | version = "0.7.0" | 479 | version = "0.7.1" |
475 | source = "registry+https://github.com/rust-lang/crates.io-index" | 480 | source = "registry+https://github.com/rust-lang/crates.io-index" |
476 | checksum = "24e40d6fd5d64e2082e0c796495c8ef5ad667a96d03e5aaa0becfd9d47bcbfb8" | 481 | checksum = "4816c66d2c8ae673df83366c18341538f234a26d65a9ecea5c348b453ac1d02f" |
477 | dependencies = [ | 482 | dependencies = [ |
478 | "bitflags", | 483 | "bitflags", |
479 | "inotify-sys", | 484 | "inotify-sys", |
@@ -561,9 +566,9 @@ dependencies = [ | |||
561 | 566 | ||
562 | [[package]] | 567 | [[package]] |
563 | name = "jod-thread" | 568 | name = "jod-thread" |
564 | version = "0.1.1" | 569 | version = "0.1.2" |
565 | source = "registry+https://github.com/rust-lang/crates.io-index" | 570 | source = "registry+https://github.com/rust-lang/crates.io-index" |
566 | checksum = "4022656272c3e564a7cdebcaaba6518d844b0d0c1836597196efb5bfeb98bb49" | 571 | checksum = "8b23360e99b8717f20aaa4598f5a6541efbe30630039fbc7706cf954a87947ae" |
567 | 572 | ||
568 | [[package]] | 573 | [[package]] |
569 | name = "kernel32-sys" | 574 | name = "kernel32-sys" |
@@ -809,9 +814,9 @@ dependencies = [ | |||
809 | 814 | ||
810 | [[package]] | 815 | [[package]] |
811 | name = "paste" | 816 | name = "paste" |
812 | version = "0.1.15" | 817 | version = "0.1.16" |
813 | source = "registry+https://github.com/rust-lang/crates.io-index" | 818 | source = "registry+https://github.com/rust-lang/crates.io-index" |
814 | checksum = "d53181dcd37421c08d3b69f887784956674d09c3f9a47a04fece2b130a5b346b" | 819 | checksum = "d508492eeb1e5c38ee696371bf7b9fc33c83d46a7d451606b96458fbbbdc2dec" |
815 | dependencies = [ | 820 | dependencies = [ |
816 | "paste-impl", | 821 | "paste-impl", |
817 | "proc-macro-hack", | 822 | "proc-macro-hack", |
@@ -819,9 +824,9 @@ dependencies = [ | |||
819 | 824 | ||
820 | [[package]] | 825 | [[package]] |
821 | name = "paste-impl" | 826 | name = "paste-impl" |
822 | version = "0.1.15" | 827 | version = "0.1.16" |
823 | source = "registry+https://github.com/rust-lang/crates.io-index" | 828 | source = "registry+https://github.com/rust-lang/crates.io-index" |
824 | checksum = "05ca490fa1c034a71412b4d1edcb904ec5a0981a4426c9eb2128c0fda7a68d17" | 829 | checksum = "84f328a6a63192b333fce5fbb4be79db6758a4d518dfac6d54412f1492f72d32" |
825 | dependencies = [ | 830 | dependencies = [ |
826 | "proc-macro-hack", | 831 | "proc-macro-hack", |
827 | "proc-macro2", | 832 | "proc-macro2", |
@@ -871,18 +876,18 @@ checksum = "7e0456befd48169b9f13ef0f0ad46d492cf9d2dbb918bcf38e01eed4ce3ec5e4" | |||
871 | 876 | ||
872 | [[package]] | 877 | [[package]] |
873 | name = "proc-macro2" | 878 | name = "proc-macro2" |
874 | version = "1.0.17" | 879 | version = "1.0.18" |
875 | source = "registry+https://github.com/rust-lang/crates.io-index" | 880 | source = "registry+https://github.com/rust-lang/crates.io-index" |
876 | checksum = "1502d12e458c49a4c9cbff560d0fe0060c252bc29799ed94ca2ed4bb665a0101" | 881 | checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa" |
877 | dependencies = [ | 882 | dependencies = [ |
878 | "unicode-xid", | 883 | "unicode-xid", |
879 | ] | 884 | ] |
880 | 885 | ||
881 | [[package]] | 886 | [[package]] |
882 | name = "quote" | 887 | name = "quote" |
883 | version = "1.0.6" | 888 | version = "1.0.7" |
884 | source = "registry+https://github.com/rust-lang/crates.io-index" | 889 | source = "registry+https://github.com/rust-lang/crates.io-index" |
885 | checksum = "54a21852a652ad6f610c9510194f398ff6f8692e334fd1145fed931f7fbe44ea" | 890 | checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" |
886 | dependencies = [ | 891 | dependencies = [ |
887 | "proc-macro2", | 892 | "proc-macro2", |
888 | ] | 893 | ] |
@@ -977,7 +982,10 @@ dependencies = [ | |||
977 | "anymap", | 982 | "anymap", |
978 | "drop_bomb", | 983 | "drop_bomb", |
979 | "either", | 984 | "either", |
985 | "fst", | ||
986 | "indexmap", | ||
980 | "insta", | 987 | "insta", |
988 | "itertools", | ||
981 | "log", | 989 | "log", |
982 | "once_cell", | 990 | "once_cell", |
983 | "ra_arena", | 991 | "ra_arena", |
@@ -1006,6 +1014,7 @@ dependencies = [ | |||
1006 | "ra_prof", | 1014 | "ra_prof", |
1007 | "ra_syntax", | 1015 | "ra_syntax", |
1008 | "ra_tt", | 1016 | "ra_tt", |
1017 | "rustc-hash", | ||
1009 | "test_utils", | 1018 | "test_utils", |
1010 | ] | 1019 | ] |
1011 | 1020 | ||
@@ -1119,6 +1128,7 @@ dependencies = [ | |||
1119 | "memmap", | 1128 | "memmap", |
1120 | "ra_mbe", | 1129 | "ra_mbe", |
1121 | "ra_proc_macro", | 1130 | "ra_proc_macro", |
1131 | "ra_toolchain", | ||
1122 | "ra_tt", | 1132 | "ra_tt", |
1123 | "serde_derive", | 1133 | "serde_derive", |
1124 | "test_utils", | 1134 | "test_utils", |
@@ -1400,9 +1410,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" | |||
1400 | 1410 | ||
1401 | [[package]] | 1411 | [[package]] |
1402 | name = "ryu" | 1412 | name = "ryu" |
1403 | version = "1.0.4" | 1413 | version = "1.0.5" |
1404 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1414 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1405 | checksum = "ed3d612bc64430efeb3f7ee6ef26d590dce0c43249217bddc62112540c7941e1" | 1415 | checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" |
1406 | 1416 | ||
1407 | [[package]] | 1417 | [[package]] |
1408 | name = "salsa" | 1418 | name = "salsa" |
@@ -1511,9 +1521,9 @@ dependencies = [ | |||
1511 | 1521 | ||
1512 | [[package]] | 1522 | [[package]] |
1513 | name = "serde_json" | 1523 | name = "serde_json" |
1514 | version = "1.0.53" | 1524 | version = "1.0.55" |
1515 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1525 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1516 | checksum = "993948e75b189211a9b31a7528f950c6adc21f9720b6438ff80a7fa2f864cea2" | 1526 | checksum = "ec2c5d7e739bc07a3e73381a39d61fdb5f671c60c1df26a130690665803d8226" |
1517 | dependencies = [ | 1527 | dependencies = [ |
1518 | "itoa", | 1528 | "itoa", |
1519 | "ryu", | 1529 | "ryu", |
@@ -1533,9 +1543,9 @@ dependencies = [ | |||
1533 | 1543 | ||
1534 | [[package]] | 1544 | [[package]] |
1535 | name = "serde_yaml" | 1545 | name = "serde_yaml" |
1536 | version = "0.8.12" | 1546 | version = "0.8.13" |
1537 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1547 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1538 | checksum = "16c7a592a1ec97c9c1c68d75b6e537dcbf60c7618e038e7841e00af1d9ccf0c4" | 1548 | checksum = "ae3e2dd40a7cdc18ca80db804b7f461a39bb721160a85c9a1fa30134bf3c02a5" |
1539 | dependencies = [ | 1549 | dependencies = [ |
1540 | "dtoa", | 1550 | "dtoa", |
1541 | "linked-hash-map", | 1551 | "linked-hash-map", |
@@ -1576,9 +1586,9 @@ checksum = "ab16ced94dbd8a46c82fd81e3ed9a8727dac2977ea869d217bcc4ea1f122e81f" | |||
1576 | 1586 | ||
1577 | [[package]] | 1587 | [[package]] |
1578 | name = "syn" | 1588 | name = "syn" |
1579 | version = "1.0.29" | 1589 | version = "1.0.31" |
1580 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1590 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1581 | checksum = "bb37da98a55b1d08529362d9cbb863be17556873df2585904ab9d2bc951291d0" | 1591 | checksum = "b5304cfdf27365b7585c25d4af91b35016ed21ef88f17ced89c7093b43dba8b6" |
1582 | dependencies = [ | 1592 | dependencies = [ |
1583 | "proc-macro2", | 1593 | "proc-macro2", |
1584 | "quote", | 1594 | "quote", |
@@ -1587,9 +1597,9 @@ dependencies = [ | |||
1587 | 1597 | ||
1588 | [[package]] | 1598 | [[package]] |
1589 | name = "synstructure" | 1599 | name = "synstructure" |
1590 | version = "0.12.3" | 1600 | version = "0.12.4" |
1591 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1601 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1592 | checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" | 1602 | checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" |
1593 | dependencies = [ | 1603 | dependencies = [ |
1594 | "proc-macro2", | 1604 | "proc-macro2", |
1595 | "quote", | 1605 | "quote", |
@@ -1639,6 +1649,7 @@ dependencies = [ | |||
1639 | "relative-path", | 1649 | "relative-path", |
1640 | "rustc-hash", | 1650 | "rustc-hash", |
1641 | "serde_json", | 1651 | "serde_json", |
1652 | "stdx", | ||
1642 | "text-size", | 1653 | "text-size", |
1643 | ] | 1654 | ] |
1644 | 1655 | ||
@@ -1797,9 +1808,9 @@ dependencies = [ | |||
1797 | 1808 | ||
1798 | [[package]] | 1809 | [[package]] |
1799 | name = "yaml-rust" | 1810 | name = "yaml-rust" |
1800 | version = "0.4.3" | 1811 | version = "0.4.4" |
1801 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1812 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1802 | checksum = "65923dd1784f44da1d2c3dbbc5e822045628c590ba72123e1c73d3c230c4434d" | 1813 | checksum = "39f0c922f1a334134dc2f7a8b67dc5d25f0735263feec974345ff706bcf20b0d" |
1803 | dependencies = [ | 1814 | dependencies = [ |
1804 | "linked-hash-map", | 1815 | "linked-hash-map", |
1805 | ] | 1816 | ] |