aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2019-07-15 20:08:48 +0100
committerbors[bot] <26634292+bors[bot]@users.noreply.github.com>2019-07-15 20:08:48 +0100
commit8eb5a1556d88c476b146ae1ff64339c479abe924 (patch)
tree2827e54764cd76b5323d281c68509c67e407eab7
parent8de56ec43e44ee227617de27ba8eddc328a90f5d (diff)
parent1fcc0026772b313638e0ea9d4b98e25d8f43c2ad (diff)
Merge #1534
1534: cargo update r=kjeremy a=kjeremy Co-authored-by: kjeremy <[email protected]>
-rw-r--r--Cargo.lock87
-rw-r--r--crates/ra_hir/Cargo.toml2
-rw-r--r--crates/ra_lsp_server/Cargo.toml2
3 files changed, 45 insertions, 46 deletions
diff --git a/Cargo.lock b/Cargo.lock
index dd6dade6c..c29370fde 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -29,7 +29,7 @@ name = "atty"
29version = "0.2.12" 29version = "0.2.12"
30source = "registry+https://github.com/rust-lang/crates.io-index" 30source = "registry+https://github.com/rust-lang/crates.io-index"
31dependencies = [ 31dependencies = [
32 "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)", 32 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
33 "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", 33 "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
34] 34]
35 35
@@ -47,7 +47,7 @@ dependencies = [
47 "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", 47 "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
48 "dbghelp-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", 48 "dbghelp-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
49 "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", 49 "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
50 "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)", 50 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
51 "rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", 51 "rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
52 "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", 52 "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
53] 53]
@@ -59,7 +59,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
59dependencies = [ 59dependencies = [
60 "backtrace-sys 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)", 60 "backtrace-sys 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)",
61 "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", 61 "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
62 "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)", 62 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
63 "rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", 63 "rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
64] 64]
65 65
@@ -69,7 +69,7 @@ version = "0.1.30"
69source = "registry+https://github.com/rust-lang/crates.io-index" 69source = "registry+https://github.com/rust-lang/crates.io-index"
70dependencies = [ 70dependencies = [
71 "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", 71 "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)",
72 "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)", 72 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
73] 73]
74 74
75[[package]] 75[[package]]
@@ -138,7 +138,7 @@ dependencies = [
138 138
139[[package]] 139[[package]]
140name = "cargo_metadata" 140name = "cargo_metadata"
141version = "0.8.0" 141version = "0.8.1"
142source = "registry+https://github.com/rust-lang/crates.io-index" 142source = "registry+https://github.com/rust-lang/crates.io-index"
143dependencies = [ 143dependencies = [
144 "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", 144 "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -218,7 +218,7 @@ name = "chrono"
218version = "0.4.7" 218version = "0.4.7"
219source = "registry+https://github.com/rust-lang/crates.io-index" 219source = "registry+https://github.com/rust-lang/crates.io-index"
220dependencies = [ 220dependencies = [
221 "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)", 221 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
222 "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", 222 "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
223 "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", 223 "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
224 "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)", 224 "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -251,7 +251,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
251dependencies = [ 251dependencies = [
252 "atty 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", 252 "atty 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
253 "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", 253 "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
254 "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)", 254 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
255 "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", 255 "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
256] 256]
257 257
@@ -277,7 +277,7 @@ dependencies = [
277 "clicolors-control 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", 277 "clicolors-control 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
278 "encode_unicode 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", 278 "encode_unicode 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
279 "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", 279 "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
280 "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)", 280 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
281 "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", 281 "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
282 "regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)", 282 "regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
283 "termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", 283 "termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -463,7 +463,7 @@ version = "0.2.5"
463source = "registry+https://github.com/rust-lang/crates.io-index" 463source = "registry+https://github.com/rust-lang/crates.io-index"
464dependencies = [ 464dependencies = [
465 "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", 465 "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
466 "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)", 466 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
467 "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", 467 "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
468] 468]
469 469
@@ -503,7 +503,7 @@ name = "fsevent-sys"
503version = "2.0.1" 503version = "2.0.1"
504source = "registry+https://github.com/rust-lang/crates.io-index" 504source = "registry+https://github.com/rust-lang/crates.io-index"
505dependencies = [ 505dependencies = [
506 "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)", 506 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
507] 507]
508 508
509[[package]] 509[[package]]
@@ -559,7 +559,7 @@ version = "0.1.6"
559source = "registry+https://github.com/rust-lang/crates.io-index" 559source = "registry+https://github.com/rust-lang/crates.io-index"
560dependencies = [ 560dependencies = [
561 "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", 561 "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
562 "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)", 562 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
563] 563]
564 564
565[[package]] 565[[package]]
@@ -619,7 +619,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
619dependencies = [ 619dependencies = [
620 "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", 620 "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
621 "inotify-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", 621 "inotify-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
622 "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)", 622 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
623] 623]
624 624
625[[package]] 625[[package]]
@@ -627,7 +627,7 @@ name = "inotify-sys"
627version = "0.1.3" 627version = "0.1.3"
628source = "registry+https://github.com/rust-lang/crates.io-index" 628source = "registry+https://github.com/rust-lang/crates.io-index"
629dependencies = [ 629dependencies = [
630 "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)", 630 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
631] 631]
632 632
633[[package]] 633[[package]]
@@ -655,7 +655,7 @@ name = "iovec"
655version = "0.1.2" 655version = "0.1.2"
656source = "registry+https://github.com/rust-lang/crates.io-index" 656source = "registry+https://github.com/rust-lang/crates.io-index"
657dependencies = [ 657dependencies = [
658 "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)", 658 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
659 "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", 659 "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
660] 660]
661 661
@@ -678,7 +678,7 @@ version = "0.2.0"
678source = "registry+https://github.com/rust-lang/crates.io-index" 678source = "registry+https://github.com/rust-lang/crates.io-index"
679dependencies = [ 679dependencies = [
680 "jemalloc-sys 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", 680 "jemalloc-sys 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
681 "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)", 681 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
682] 682]
683 683
684[[package]] 684[[package]]
@@ -688,7 +688,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
688dependencies = [ 688dependencies = [
689 "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", 689 "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)",
690 "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", 690 "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
691 "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)", 691 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
692] 692]
693 693
694[[package]] 694[[package]]
@@ -697,7 +697,7 @@ version = "0.1.9"
697source = "registry+https://github.com/rust-lang/crates.io-index" 697source = "registry+https://github.com/rust-lang/crates.io-index"
698dependencies = [ 698dependencies = [
699 "jemalloc-sys 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", 699 "jemalloc-sys 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
700 "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)", 700 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
701] 701]
702 702
703[[package]] 703[[package]]
@@ -739,7 +739,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
739 739
740[[package]] 740[[package]]
741name = "libc" 741name = "libc"
742version = "0.2.59" 742version = "0.2.60"
743source = "registry+https://github.com/rust-lang/crates.io-index" 743source = "registry+https://github.com/rust-lang/crates.io-index"
744 744
745[[package]] 745[[package]]
@@ -815,7 +815,7 @@ dependencies = [
815 "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", 815 "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
816 "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", 816 "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
817 "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", 817 "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
818 "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)", 818 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
819 "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", 819 "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
820 "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", 820 "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
821 "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", 821 "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -851,7 +851,7 @@ version = "0.2.33"
851source = "registry+https://github.com/rust-lang/crates.io-index" 851source = "registry+https://github.com/rust-lang/crates.io-index"
852dependencies = [ 852dependencies = [
853 "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", 853 "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
854 "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)", 854 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
855 "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", 855 "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
856] 856]
857 857
@@ -871,7 +871,7 @@ dependencies = [
871 "fsevent-sys 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", 871 "fsevent-sys 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
872 "inotify 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", 872 "inotify 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
873 "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", 873 "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
874 "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)", 874 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
875 "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", 875 "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)",
876 "mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)", 876 "mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
877 "walkdir 2.2.8 (registry+https://github.com/rust-lang/crates.io-index)", 877 "walkdir 2.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -910,7 +910,7 @@ name = "num_cpus"
910version = "1.10.1" 910version = "1.10.1"
911source = "registry+https://github.com/rust-lang/crates.io-index" 911source = "registry+https://github.com/rust-lang/crates.io-index"
912dependencies = [ 912dependencies = [
913 "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)", 913 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
914] 914]
915 915
916[[package]] 916[[package]]
@@ -923,11 +923,10 @@ dependencies = [
923 923
924[[package]] 924[[package]]
925name = "once_cell" 925name = "once_cell"
926version = "0.2.2" 926version = "0.2.3"
927source = "registry+https://github.com/rust-lang/crates.io-index" 927source = "registry+https://github.com/rust-lang/crates.io-index"
928dependencies = [ 928dependencies = [
929 "lock_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", 929 "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
930 "parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
931] 930]
932 931
933[[package]] 932[[package]]
@@ -967,7 +966,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
967dependencies = [ 966dependencies = [
968 "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", 967 "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
969 "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", 968 "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
970 "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)", 969 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
971 "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", 970 "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
972 "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", 971 "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
973 "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", 972 "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -982,7 +981,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
982dependencies = [ 981dependencies = [
983 "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", 982 "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
984 "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", 983 "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
985 "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)", 984 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
986 "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", 985 "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
987 "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", 986 "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
988 "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", 987 "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1096,7 +1095,7 @@ dependencies = [
1096 "arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", 1095 "arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
1097 "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", 1096 "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
1098 "join_to_string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", 1097 "join_to_string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
1099 "once_cell 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", 1098 "once_cell 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
1100 "ra_db 0.1.0", 1099 "ra_db 0.1.0",
1101 "ra_fmt 0.1.0", 1100 "ra_fmt 0.1.0",
1102 "ra_hir 0.1.0", 1101 "ra_hir 0.1.0",
@@ -1164,8 +1163,8 @@ dependencies = [
1164 "insta 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", 1163 "insta 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
1165 "lalrpop-intern 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)", 1164 "lalrpop-intern 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)",
1166 "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", 1165 "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
1167 "once_cell 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", 1166 "once_cell 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
1168 "parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", 1167 "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
1169 "ra_arena 0.1.0", 1168 "ra_arena 0.1.0",
1170 "ra_db 0.1.0", 1169 "ra_db 0.1.0",
1171 "ra_mbe 0.1.0", 1170 "ra_mbe 0.1.0",
@@ -1212,7 +1211,7 @@ dependencies = [
1212 "gen_lsp_server 0.2.0", 1211 "gen_lsp_server 0.2.0",
1213 "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", 1212 "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
1214 "lsp-types 0.59.0 (registry+https://github.com/rust-lang/crates.io-index)", 1213 "lsp-types 0.59.0 (registry+https://github.com/rust-lang/crates.io-index)",
1215 "parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", 1214 "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
1216 "ra_ide_api 0.1.0", 1215 "ra_ide_api 0.1.0",
1217 "ra_prof 0.1.0", 1216 "ra_prof 0.1.0",
1218 "ra_project_model 0.1.0", 1217 "ra_project_model 0.1.0",
@@ -1259,14 +1258,14 @@ dependencies = [
1259 "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", 1258 "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
1260 "jemalloc-ctl 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", 1259 "jemalloc-ctl 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
1261 "jemallocator 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", 1260 "jemallocator 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
1262 "once_cell 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", 1261 "once_cell 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
1263] 1262]
1264 1263
1265[[package]] 1264[[package]]
1266name = "ra_project_model" 1265name = "ra_project_model"
1267version = "0.1.0" 1266version = "0.1.0"
1268dependencies = [ 1267dependencies = [
1269 "cargo_metadata 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", 1268 "cargo_metadata 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
1270 "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", 1269 "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
1271 "ra_arena 0.1.0", 1270 "ra_arena 0.1.0",
1272 "ra_db 0.1.0", 1271 "ra_db 0.1.0",
@@ -1336,7 +1335,7 @@ version = "0.6.5"
1336source = "registry+https://github.com/rust-lang/crates.io-index" 1335source = "registry+https://github.com/rust-lang/crates.io-index"
1337dependencies = [ 1336dependencies = [
1338 "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", 1337 "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
1339 "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)", 1338 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
1340 "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", 1339 "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
1341 "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", 1340 "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
1342 "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", 1341 "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1354,7 +1353,7 @@ version = "0.7.0"
1354source = "registry+https://github.com/rust-lang/crates.io-index" 1353source = "registry+https://github.com/rust-lang/crates.io-index"
1355dependencies = [ 1354dependencies = [
1356 "getrandom 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", 1355 "getrandom 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
1357 "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)", 1356 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
1358 "rand_chacha 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", 1357 "rand_chacha 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
1359 "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", 1358 "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
1360 "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", 1359 "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1430,7 +1429,7 @@ name = "rand_jitter"
1430version = "0.1.4" 1429version = "0.1.4"
1431source = "registry+https://github.com/rust-lang/crates.io-index" 1430source = "registry+https://github.com/rust-lang/crates.io-index"
1432dependencies = [ 1431dependencies = [
1433 "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)", 1432 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
1434 "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", 1433 "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
1435 "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", 1434 "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
1436] 1435]
@@ -1442,7 +1441,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1442dependencies = [ 1441dependencies = [
1443 "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", 1442 "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
1444 "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", 1443 "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
1445 "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)", 1444 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
1446 "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", 1445 "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
1447 "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", 1446 "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
1448 "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", 1447 "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1737,7 +1736,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1737dependencies = [ 1736dependencies = [
1738 "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", 1737 "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)",
1739 "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", 1738 "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
1740 "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)", 1739 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
1741 "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", 1740 "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
1742] 1741]
1743 1742
@@ -1778,7 +1777,7 @@ version = "3.1.0"
1778source = "registry+https://github.com/rust-lang/crates.io-index" 1777source = "registry+https://github.com/rust-lang/crates.io-index"
1779dependencies = [ 1778dependencies = [
1780 "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", 1779 "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
1781 "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)", 1780 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
1782 "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", 1781 "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
1783 "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", 1782 "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
1784 "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", 1783 "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1820,7 +1819,7 @@ name = "termios"
1820version = "0.3.1" 1819version = "0.3.1"
1821source = "registry+https://github.com/rust-lang/crates.io-index" 1820source = "registry+https://github.com/rust-lang/crates.io-index"
1822dependencies = [ 1821dependencies = [
1823 "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)", 1822 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
1824] 1823]
1825 1824
1826[[package]] 1825[[package]]
@@ -1874,7 +1873,7 @@ name = "time"
1874version = "0.1.42" 1873version = "0.1.42"
1875source = "registry+https://github.com/rust-lang/crates.io-index" 1874source = "registry+https://github.com/rust-lang/crates.io-index"
1876dependencies = [ 1875dependencies = [
1877 "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)", 1876 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
1878 "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", 1877 "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
1879 "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", 1878 "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
1880] 1879]
@@ -2107,7 +2106,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
2107"checksum byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" 2106"checksum byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
2108"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" 2107"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
2109"checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101" 2108"checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101"
2110"checksum cargo_metadata 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "929766d993a2fde7a0ae962ee82429069cd7b68839cd9375b98efd719df65d3a" 2109"checksum cargo_metadata 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5e904f164f39cae0c3a4f2713eb97a47ba64676a071e99a69ddfef4994694d2c"
2111"checksum cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)" = "39f75544d7bbaf57560d2168f28fd649ff9c76153874db88bdbdfd839b1a7e7d" 2110"checksum cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)" = "39f75544d7bbaf57560d2168f28fd649ff9c76153874db88bdbdfd839b1a7e7d"
2112"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" 2111"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33"
2113"checksum chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git)" = "<none>" 2112"checksum chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git)" = "<none>"
@@ -2178,7 +2177,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
2178"checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" 2177"checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
2179"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" 2178"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14"
2180"checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" 2179"checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
2181"checksum libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)" = "3262021842bf00fe07dbd6cf34ff25c99d7a7ebef8deea84db72be3ea3bb0aff" 2180"checksum libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)" = "d44e80633f007889c7eff624b709ab43c92d708caad982295768a7b13ca3b5eb"
2182"checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83" 2181"checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83"
2183"checksum lock_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ed946d4529956a20f2d63ebe1b69996d5a2137c91913fe3ebbeff957f5bca7ff" 2182"checksum lock_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ed946d4529956a20f2d63ebe1b69996d5a2137c91913fe3ebbeff957f5bca7ff"
2184"checksum lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8912e782533a93a167888781b836336a6ca5da6175c05944c86cf28c31104dc" 2183"checksum lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8912e782533a93a167888781b836336a6ca5da6175c05944c86cf28c31104dc"
@@ -2199,7 +2198,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
2199"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" 2198"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32"
2200"checksum num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bcef43580c035376c0705c42792c294b66974abbfd2789b511784023f71f3273" 2199"checksum num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bcef43580c035376c0705c42792c294b66974abbfd2789b511784023f71f3273"
2201"checksum number_prefix 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "dbf9993e59c894e3c08aa1c2712914e9e6bf1fcbfc6bef283e2183df345a4fee" 2200"checksum number_prefix 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "dbf9993e59c894e3c08aa1c2712914e9e6bf1fcbfc6bef283e2183df345a4fee"
2202"checksum once_cell 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6959fb95e7164b7707aa016c65652f9f5a29a9210aa1800e64f51c6ac9988d51" 2201"checksum once_cell 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9a2252e34627a9c92cc13aef3dff2ff753f460d3dc62a8a9665ae68e2ac5be51"
2203"checksum opaque-debug 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "93f5bb2e8e8dec81642920ccff6b61f1eb94fa3020c5a325c9851ff604152409" 2202"checksum opaque-debug 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "93f5bb2e8e8dec81642920ccff6b61f1eb94fa3020c5a325c9851ff604152409"
2204"checksum ordermap 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a86ed3f5f244b372d6b1a00b72ef7f8876d0bc6a78a4c9985c53614041512063" 2203"checksum ordermap 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a86ed3f5f244b372d6b1a00b72ef7f8876d0bc6a78a4c9985c53614041512063"
2205"checksum parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fa7767817701cce701d5585b9c4db3cdd02086398322c1d7e8bf5094a96a2ce7" 2204"checksum parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fa7767817701cce701d5585b9c4db3cdd02086398322c1d7e8bf5094a96a2ce7"
diff --git a/crates/ra_hir/Cargo.toml b/crates/ra_hir/Cargo.toml
index 833956ce8..af4071e6f 100644
--- a/crates/ra_hir/Cargo.toml
+++ b/crates/ra_hir/Cargo.toml
@@ -9,7 +9,7 @@ arrayvec = "0.4.10"
9log = "0.4.5" 9log = "0.4.5"
10relative-path = "0.4.0" 10relative-path = "0.4.0"
11rustc-hash = "1.0" 11rustc-hash = "1.0"
12parking_lot = "0.8.0" 12parking_lot = "0.9.0"
13ena = "0.13" 13ena = "0.13"
14once_cell = "0.2" 14once_cell = "0.2"
15 15
diff --git a/crates/ra_lsp_server/Cargo.toml b/crates/ra_lsp_server/Cargo.toml
index 753710931..e73e0b419 100644
--- a/crates/ra_lsp_server/Cargo.toml
+++ b/crates/ra_lsp_server/Cargo.toml
@@ -15,7 +15,7 @@ log = "0.4.3"
15url_serde = "0.2.0" 15url_serde = "0.2.0"
16lsp-types = { version = "0.59.0", features = ["proposed"] } 16lsp-types = { version = "0.59.0", features = ["proposed"] }
17rustc-hash = "1.0" 17rustc-hash = "1.0"
18parking_lot = "0.8.0" 18parking_lot = "0.9.0"
19 19
20ra_vfs = "0.2.0" 20ra_vfs = "0.2.0"
21thread_worker = { path = "../thread_worker" } 21thread_worker = { path = "../thread_worker" }