diff options
-rw-r--r-- | Cargo.lock | 51 | ||||
-rw-r--r-- | crates/ra_hir/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/ra_lsp_server/Cargo.toml | 2 |
3 files changed, 7 insertions, 48 deletions
diff --git a/Cargo.lock b/Cargo.lock index 5feb78450..12da410d0 100644 --- a/Cargo.lock +++ b/Cargo.lock | |||
@@ -611,7 +611,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
611 | 611 | ||
612 | [[package]] | 612 | [[package]] |
613 | name = "lock_api" | 613 | name = "lock_api" |
614 | version = "0.3.1" | 614 | version = "0.3.2" |
615 | source = "registry+https://github.com/rust-lang/crates.io-index" | 615 | source = "registry+https://github.com/rust-lang/crates.io-index" |
616 | dependencies = [ | 616 | dependencies = [ |
617 | "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", | 617 | "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", |
@@ -654,11 +654,6 @@ version = "0.1.8" | |||
654 | source = "registry+https://github.com/rust-lang/crates.io-index" | 654 | source = "registry+https://github.com/rust-lang/crates.io-index" |
655 | 655 | ||
656 | [[package]] | 656 | [[package]] |
657 | name = "maybe-uninit" | ||
658 | version = "2.0.0" | ||
659 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
660 | |||
661 | [[package]] | ||
662 | name = "memchr" | 657 | name = "memchr" |
663 | version = "2.2.1" | 658 | version = "2.2.1" |
664 | source = "registry+https://github.com/rust-lang/crates.io-index" | 659 | source = "registry+https://github.com/rust-lang/crates.io-index" |
@@ -781,39 +776,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
781 | 776 | ||
782 | [[package]] | 777 | [[package]] |
783 | name = "parking_lot" | 778 | name = "parking_lot" |
784 | version = "0.9.0" | ||
785 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
786 | dependencies = [ | ||
787 | "lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", | ||
788 | "parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", | ||
789 | "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", | ||
790 | ] | ||
791 | |||
792 | [[package]] | ||
793 | name = "parking_lot" | ||
794 | version = "0.10.0" | 779 | version = "0.10.0" |
795 | source = "registry+https://github.com/rust-lang/crates.io-index" | 780 | source = "registry+https://github.com/rust-lang/crates.io-index" |
796 | dependencies = [ | 781 | dependencies = [ |
797 | "lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", | 782 | "lock_api 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", |
798 | "parking_lot_core 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", | 783 | "parking_lot_core 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", |
799 | ] | 784 | ] |
800 | 785 | ||
801 | [[package]] | 786 | [[package]] |
802 | name = "parking_lot_core" | 787 | name = "parking_lot_core" |
803 | version = "0.6.2" | ||
804 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
805 | dependencies = [ | ||
806 | "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", | ||
807 | "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", | ||
808 | "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", | ||
809 | "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", | ||
810 | "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", | ||
811 | "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", | ||
812 | "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", | ||
813 | ] | ||
814 | |||
815 | [[package]] | ||
816 | name = "parking_lot_core" | ||
817 | version = "0.7.0" | 788 | version = "0.7.0" |
818 | source = "registry+https://github.com/rust-lang/crates.io-index" | 789 | source = "registry+https://github.com/rust-lang/crates.io-index" |
819 | dependencies = [ | 790 | dependencies = [ |
@@ -1018,7 +989,7 @@ dependencies = [ | |||
1018 | "lalrpop-intern 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)", | 989 | "lalrpop-intern 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)", |
1019 | "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", | 990 | "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", |
1020 | "once_cell 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", | 991 | "once_cell 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", |
1021 | "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", | 992 | "parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", |
1022 | "ra_arena 0.1.0", | 993 | "ra_arena 0.1.0", |
1023 | "ra_cfg 0.1.0", | 994 | "ra_cfg 0.1.0", |
1024 | "ra_db 0.1.0", | 995 | "ra_db 0.1.0", |
@@ -1103,7 +1074,7 @@ dependencies = [ | |||
1103 | "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", | 1074 | "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", |
1104 | "lsp-server 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", | 1075 | "lsp-server 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", |
1105 | "lsp-types 0.61.0 (registry+https://github.com/rust-lang/crates.io-index)", | 1076 | "lsp-types 0.61.0 (registry+https://github.com/rust-lang/crates.io-index)", |
1106 | "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", | 1077 | "parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", |
1107 | "ra_ide_api 0.1.0", | 1078 | "ra_ide_api 0.1.0", |
1108 | "ra_prof 0.1.0", | 1079 | "ra_prof 0.1.0", |
1109 | "ra_project_model 0.1.0", | 1080 | "ra_project_model 0.1.0", |
@@ -1591,14 +1562,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
1591 | 1562 | ||
1592 | [[package]] | 1563 | [[package]] |
1593 | name = "smallvec" | 1564 | name = "smallvec" |
1594 | version = "0.6.13" | ||
1595 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
1596 | dependencies = [ | ||
1597 | "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", | ||
1598 | ] | ||
1599 | |||
1600 | [[package]] | ||
1601 | name = "smallvec" | ||
1602 | version = "1.0.0" | 1565 | version = "1.0.0" |
1603 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1566 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1604 | 1567 | ||
@@ -1931,12 +1894,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
1931 | "checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" | 1894 | "checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" |
1932 | "checksum libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "1a31a0627fdf1f6a39ec0dd577e101440b7db22672c0901fe00a9a6fbb5c24e8" | 1895 | "checksum libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "1a31a0627fdf1f6a39ec0dd577e101440b7db22672c0901fe00a9a6fbb5c24e8" |
1933 | "checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83" | 1896 | "checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83" |
1934 | "checksum lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8912e782533a93a167888781b836336a6ca5da6175c05944c86cf28c31104dc" | 1897 | "checksum lock_api 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e57b3997725d2b60dbec1297f6c2e2957cc383db1cebd6be812163f969c7d586" |
1935 | "checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" | 1898 | "checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" |
1936 | "checksum lsp-server 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0ba36405bd742139ab79c246ca5adb7fde2fe1a0f495e2c8e2f607b607dedb12" | 1899 | "checksum lsp-server 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0ba36405bd742139ab79c246ca5adb7fde2fe1a0f495e2c8e2f607b607dedb12" |
1937 | "checksum lsp-types 0.61.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fa3268fbe8beb2795c2fb327bf44f4f3d24f5fe9ebc18d7e2980afd444d72bcf" | 1900 | "checksum lsp-types 0.61.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fa3268fbe8beb2795c2fb327bf44f4f3d24f5fe9ebc18d7e2980afd444d72bcf" |
1938 | "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" | 1901 | "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" |
1939 | "checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" | ||
1940 | "checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" | 1902 | "checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" |
1941 | "checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9" | 1903 | "checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9" |
1942 | "checksum mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)" = "83f51996a3ed004ef184e16818edc51fadffe8e7ca68be67f9dee67d84d0ff23" | 1904 | "checksum mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)" = "83f51996a3ed004ef184e16818edc51fadffe8e7ca68be67f9dee67d84d0ff23" |
@@ -1951,8 +1913,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
1951 | "checksum once_cell 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "891f486f630e5c5a4916c7e16c4b24a53e78c860b646e9f8e005e4f16847bfed" | 1913 | "checksum once_cell 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "891f486f630e5c5a4916c7e16c4b24a53e78c860b646e9f8e005e4f16847bfed" |
1952 | "checksum ordermap 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a86ed3f5f244b372d6b1a00b72ef7f8876d0bc6a78a4c9985c53614041512063" | 1914 | "checksum ordermap 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a86ed3f5f244b372d6b1a00b72ef7f8876d0bc6a78a4c9985c53614041512063" |
1953 | "checksum parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "92e98c49ab0b7ce5b222f2cc9193fc4efe11c6d0bd4f648e374684a6857b1cfc" | 1915 | "checksum parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "92e98c49ab0b7ce5b222f2cc9193fc4efe11c6d0bd4f648e374684a6857b1cfc" |
1954 | "checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" | ||
1955 | "checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" | ||
1956 | "checksum parking_lot_core 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7582838484df45743c8434fbff785e8edf260c28748353d44bc0da32e0ceabf1" | 1916 | "checksum parking_lot_core 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7582838484df45743c8434fbff785e8edf260c28748353d44bc0da32e0ceabf1" |
1957 | "checksum paste 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "423a519e1c6e828f1e73b720f9d9ed2fa643dce8a7737fb43235ce0b41eeaa49" | 1917 | "checksum paste 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "423a519e1c6e828f1e73b720f9d9ed2fa643dce8a7737fb43235ce0b41eeaa49" |
1958 | "checksum paste-impl 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4214c9e912ef61bf42b81ba9a47e8aad1b2ffaf739ab162bf96d1e011f54e6c5" | 1918 | "checksum paste-impl 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4214c9e912ef61bf42b81ba9a47e8aad1b2ffaf739ab162bf96d1e011f54e6c5" |
@@ -2009,7 +1969,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
2009 | "checksum serde_repr 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "cd02c7587ec314570041b2754829f84d873ced14a96d1fd1823531e11db40573" | 1969 | "checksum serde_repr 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "cd02c7587ec314570041b2754829f84d873ced14a96d1fd1823531e11db40573" |
2010 | "checksum serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)" = "691b17f19fc1ec9d94ec0b5864859290dff279dbd7b03f017afda54eb36c3c35" | 1970 | "checksum serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)" = "691b17f19fc1ec9d94ec0b5864859290dff279dbd7b03f017afda54eb36c3c35" |
2011 | "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" | 1971 | "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" |
2012 | "checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" | ||
2013 | "checksum smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecf3b85f68e8abaa7555aa5abdb1153079387e60b718283d732f03897fcfc86" | 1972 | "checksum smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecf3b85f68e8abaa7555aa5abdb1153079387e60b718283d732f03897fcfc86" |
2014 | "checksum smol_str 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "34836c9a295c62c2ce3514471117c5cb269891e8421b2aafdd910050576c4d8b" | 1973 | "checksum smol_str 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "34836c9a295c62c2ce3514471117c5cb269891e8421b2aafdd910050576c4d8b" |
2015 | "checksum stacker 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d96fc4f13a0ac088e9a3cd9af1cc8c5cc1ab5deb2145cef661267dfc9c542f8a" | 1974 | "checksum stacker 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d96fc4f13a0ac088e9a3cd9af1cc8c5cc1ab5deb2145cef661267dfc9c542f8a" |
diff --git a/crates/ra_hir/Cargo.toml b/crates/ra_hir/Cargo.toml index f72574485..16bd4bafc 100644 --- a/crates/ra_hir/Cargo.toml +++ b/crates/ra_hir/Cargo.toml | |||
@@ -11,7 +11,7 @@ doctest = false | |||
11 | arrayvec = "0.5.1" | 11 | arrayvec = "0.5.1" |
12 | log = "0.4.5" | 12 | log = "0.4.5" |
13 | rustc-hash = "1.0" | 13 | rustc-hash = "1.0" |
14 | parking_lot = "0.9.0" | 14 | parking_lot = "0.10.0" |
15 | ena = "0.13" | 15 | ena = "0.13" |
16 | once_cell = "1.0.1" | 16 | once_cell = "1.0.1" |
17 | 17 | ||
diff --git a/crates/ra_lsp_server/Cargo.toml b/crates/ra_lsp_server/Cargo.toml index 72dbe06dc..58b9cfaa0 100644 --- a/crates/ra_lsp_server/Cargo.toml +++ b/crates/ra_lsp_server/Cargo.toml | |||
@@ -17,7 +17,7 @@ flexi_logger = "0.14.0" | |||
17 | log = "0.4.3" | 17 | log = "0.4.3" |
18 | lsp-types = { version = "0.61.0", features = ["proposed"] } | 18 | lsp-types = { version = "0.61.0", features = ["proposed"] } |
19 | rustc-hash = "1.0" | 19 | rustc-hash = "1.0" |
20 | parking_lot = "0.9.0" | 20 | parking_lot = "0.10.0" |
21 | jod-thread = "0.1.0" | 21 | jod-thread = "0.1.0" |
22 | ra_vfs = "0.5.0" | 22 | ra_vfs = "0.5.0" |
23 | ra_syntax = { path = "../ra_syntax" } | 23 | ra_syntax = { path = "../ra_syntax" } |