diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-12-23 23:47:32 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-12-23 23:47:32 +0000 |
commit | aa49b79bda5b7cafbaa33c302a9974133d34c52b (patch) | |
tree | 5f11d0c6be250535baf22a49b044285761c5affc | |
parent | 527027d32e674850e62c5348933ec68d8d3ddf60 (diff) | |
parent | 9c92f205b153c54efbd6dabd084229518a0a112d (diff) |
Merge #2659
2659: Update lsp-types and rayon r=kjeremy a=kjeremy
Brings in https://github.com/gluon-lang/lsp-types/pull/129 for https://github.com/rust-analyzer/rust-analyzer/issues/2651#issuecomment-568554427
Co-authored-by: Jeremy Kolb <[email protected]>
-rw-r--r-- | Cargo.lock | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Cargo.lock b/Cargo.lock index 9f44599fd..792e30494 100644 --- a/Cargo.lock +++ b/Cargo.lock | |||
@@ -625,7 +625,7 @@ dependencies = [ | |||
625 | 625 | ||
626 | [[package]] | 626 | [[package]] |
627 | name = "lsp-types" | 627 | name = "lsp-types" |
628 | version = "0.67.0" | 628 | version = "0.67.1" |
629 | source = "registry+https://github.com/rust-lang/crates.io-index" | 629 | source = "registry+https://github.com/rust-lang/crates.io-index" |
630 | dependencies = [ | 630 | dependencies = [ |
631 | "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", | 631 | "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", |
@@ -1040,7 +1040,7 @@ dependencies = [ | |||
1040 | "ra_syntax 0.1.0", | 1040 | "ra_syntax 0.1.0", |
1041 | "ra_text_edit 0.1.0", | 1041 | "ra_text_edit 0.1.0", |
1042 | "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", | 1042 | "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", |
1043 | "rayon 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", | 1043 | "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", |
1044 | "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", | 1044 | "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", |
1045 | "superslice 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", | 1045 | "superslice 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", |
1046 | "test_utils 0.1.0", | 1046 | "test_utils 0.1.0", |
@@ -1056,7 +1056,7 @@ dependencies = [ | |||
1056 | "jod-thread 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", | 1056 | "jod-thread 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", |
1057 | "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", | 1057 | "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", |
1058 | "lsp-server 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", | 1058 | "lsp-server 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", |
1059 | "lsp-types 0.67.0 (registry+https://github.com/rust-lang/crates.io-index)", | 1059 | "lsp-types 0.67.1 (registry+https://github.com/rust-lang/crates.io-index)", |
1060 | "parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", | 1060 | "parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", |
1061 | "ra_ide 0.1.0", | 1061 | "ra_ide 0.1.0", |
1062 | "ra_prof 0.1.0", | 1062 | "ra_prof 0.1.0", |
@@ -1320,17 +1320,17 @@ dependencies = [ | |||
1320 | 1320 | ||
1321 | [[package]] | 1321 | [[package]] |
1322 | name = "rayon" | 1322 | name = "rayon" |
1323 | version = "1.2.1" | 1323 | version = "1.3.0" |
1324 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1324 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1325 | dependencies = [ | 1325 | dependencies = [ |
1326 | "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", | 1326 | "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", |
1327 | "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", | 1327 | "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", |
1328 | "rayon-core 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)", | 1328 | "rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", |
1329 | ] | 1329 | ] |
1330 | 1330 | ||
1331 | [[package]] | 1331 | [[package]] |
1332 | name = "rayon-core" | 1332 | name = "rayon-core" |
1333 | version = "1.6.1" | 1333 | version = "1.7.0" |
1334 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1334 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1335 | dependencies = [ | 1335 | dependencies = [ |
1336 | "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", | 1336 | "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", |
@@ -1849,7 +1849,7 @@ dependencies = [ | |||
1849 | "checksum lock_api 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e57b3997725d2b60dbec1297f6c2e2957cc383db1cebd6be812163f969c7d586" | 1849 | "checksum lock_api 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e57b3997725d2b60dbec1297f6c2e2957cc383db1cebd6be812163f969c7d586" |
1850 | "checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" | 1850 | "checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" |
1851 | "checksum lsp-server 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0ba36405bd742139ab79c246ca5adb7fde2fe1a0f495e2c8e2f607b607dedb12" | 1851 | "checksum lsp-server 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0ba36405bd742139ab79c246ca5adb7fde2fe1a0f495e2c8e2f607b607dedb12" |
1852 | "checksum lsp-types 0.67.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0e7728b2c5a0e15fbb530bbd8b56520d19d56d89491a2a5e8b875f104e745b76" | 1852 | "checksum lsp-types 0.67.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aea9639ebf210bd5de66931cbdb2d4a8bcc1fa1e5b2dece7daa6b387ab42e803" |
1853 | "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" | 1853 | "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" |
1854 | "checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" | 1854 | "checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" |
1855 | "checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9" | 1855 | "checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9" |
@@ -1891,8 +1891,8 @@ dependencies = [ | |||
1891 | "checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" | 1891 | "checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" |
1892 | "checksum rand_pcg 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" | 1892 | "checksum rand_pcg 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" |
1893 | "checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" | 1893 | "checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" |
1894 | "checksum rayon 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "43739f8831493b276363637423d3622d4bd6394ab6f0a9c4a552e208aeb7fddd" | 1894 | "checksum rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098" |
1895 | "checksum rayon-core 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8bf17de6f23b05473c437eb958b9c850bfc8af0961fe17b4cc92d5a627b4791" | 1895 | "checksum rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9" |
1896 | "checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" | 1896 | "checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" |
1897 | "checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" | 1897 | "checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" |
1898 | "checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd" | 1898 | "checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd" |