aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cargo.lock74
-rw-r--r--Cargo.toml1
-rw-r--r--crates/ra_db/Cargo.toml2
-rw-r--r--crates/ra_db/src/lib.rs5
-rw-r--r--crates/ra_hir/Cargo.toml2
-rw-r--r--crates/ra_ide_api/Cargo.toml2
-rw-r--r--crates/ra_syntax/Cargo.toml2
7 files changed, 44 insertions, 44 deletions
diff --git a/Cargo.lock b/Cargo.lock
index e5830574f..56fb4aad3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -32,7 +32,7 @@ name = "atty"
32version = "0.2.11" 32version = "0.2.11"
33source = "registry+https://github.com/rust-lang/crates.io-index" 33source = "registry+https://github.com/rust-lang/crates.io-index"
34dependencies = [ 34dependencies = [
35 "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", 35 "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
36 "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", 36 "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
37 "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", 37 "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
38] 38]
@@ -50,7 +50,7 @@ dependencies = [
50 "autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", 50 "autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
51 "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", 51 "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
52 "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", 52 "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
53 "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", 53 "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
54 "rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", 54 "rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
55 "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", 55 "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
56] 56]
@@ -61,7 +61,7 @@ version = "0.1.28"
61source = "registry+https://github.com/rust-lang/crates.io-index" 61source = "registry+https://github.com/rust-lang/crates.io-index"
62dependencies = [ 62dependencies = [
63 "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)", 63 "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
64 "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", 64 "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
65] 65]
66 66
67[[package]] 67[[package]]
@@ -162,7 +162,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
162dependencies = [ 162dependencies = [
163 "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", 163 "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
164 "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", 164 "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
165 "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", 165 "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
166 "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", 166 "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
167] 167]
168 168
@@ -183,7 +183,7 @@ dependencies = [
183 "clicolors-control 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", 183 "clicolors-control 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
184 "encode_unicode 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", 184 "encode_unicode 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
185 "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", 185 "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
186 "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", 186 "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
187 "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", 187 "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
188 "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", 188 "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
189 "termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", 189 "termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -248,7 +248,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
248dependencies = [ 248dependencies = [
249 "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", 249 "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
250 "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", 250 "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
251 "syn 0.15.24 (registry+https://github.com/rust-lang/crates.io-index)", 251 "syn 0.15.25 (registry+https://github.com/rust-lang/crates.io-index)",
252] 252]
253 253
254[[package]] 254[[package]]
@@ -316,7 +316,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
316dependencies = [ 316dependencies = [
317 "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", 317 "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
318 "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", 318 "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
319 "syn 0.15.24 (registry+https://github.com/rust-lang/crates.io-index)", 319 "syn 0.15.25 (registry+https://github.com/rust-lang/crates.io-index)",
320 "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", 320 "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
321] 321]
322 322
@@ -465,7 +465,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
465 465
466[[package]] 466[[package]]
467name = "libc" 467name = "libc"
468version = "0.2.46" 468version = "0.2.47"
469source = "registry+https://github.com/rust-lang/crates.io-index" 469source = "registry+https://github.com/rust-lang/crates.io-index"
470 470
471[[package]] 471[[package]]
@@ -516,7 +516,7 @@ version = "2.1.2"
516source = "registry+https://github.com/rust-lang/crates.io-index" 516source = "registry+https://github.com/rust-lang/crates.io-index"
517dependencies = [ 517dependencies = [
518 "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", 518 "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
519 "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", 519 "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
520 "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", 520 "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
521] 521]
522 522
@@ -525,7 +525,7 @@ name = "memmap"
525version = "0.6.2" 525version = "0.6.2"
526source = "registry+https://github.com/rust-lang/crates.io-index" 526source = "registry+https://github.com/rust-lang/crates.io-index"
527dependencies = [ 527dependencies = [
528 "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", 528 "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
529 "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", 529 "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
530] 530]
531 531
@@ -547,7 +547,7 @@ dependencies = [
547 "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", 547 "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
548 "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", 548 "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
549 "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", 549 "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
550 "syn 0.15.24 (registry+https://github.com/rust-lang/crates.io-index)", 550 "syn 0.15.25 (registry+https://github.com/rust-lang/crates.io-index)",
551] 551]
552 552
553[[package]] 553[[package]]
@@ -568,7 +568,7 @@ name = "num_cpus"
568version = "1.9.0" 568version = "1.9.0"
569source = "registry+https://github.com/rust-lang/crates.io-index" 569source = "registry+https://github.com/rust-lang/crates.io-index"
570dependencies = [ 570dependencies = [
571 "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", 571 "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
572] 572]
573 573
574[[package]] 574[[package]]
@@ -593,7 +593,7 @@ name = "parking_lot_core"
593version = "0.4.0" 593version = "0.4.0"
594source = "registry+https://github.com/rust-lang/crates.io-index" 594source = "registry+https://github.com/rust-lang/crates.io-index"
595dependencies = [ 595dependencies = [
596 "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", 596 "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
597 "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", 597 "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
598 "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", 598 "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
599 "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)", 599 "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -631,7 +631,7 @@ dependencies = [
631 "pest_meta 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", 631 "pest_meta 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
632 "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", 632 "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
633 "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", 633 "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
634 "syn 0.15.24 (registry+https://github.com/rust-lang/crates.io-index)", 634 "syn 0.15.25 (registry+https://github.com/rust-lang/crates.io-index)",
635] 635]
636 636
637[[package]] 637[[package]]
@@ -707,7 +707,7 @@ dependencies = [
707 "ra_syntax 0.1.0", 707 "ra_syntax 0.1.0",
708 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", 708 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
709 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", 709 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
710 "salsa 0.9.1 (git+https://github.com/matklad/salsa?branch=panic-hooks)", 710 "salsa 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
711 "test_utils 0.1.0", 711 "test_utils 0.1.0",
712] 712]
713 713
@@ -726,7 +726,7 @@ dependencies = [
726 "ra_syntax 0.1.0", 726 "ra_syntax 0.1.0",
727 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", 727 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
728 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", 728 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
729 "salsa 0.9.1 (git+https://github.com/matklad/salsa?branch=panic-hooks)", 729 "salsa 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
730 "test_utils 0.1.0", 730 "test_utils 0.1.0",
731] 731]
732 732
@@ -747,7 +747,7 @@ dependencies = [
747 "rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", 747 "rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
748 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", 748 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
749 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", 749 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
750 "salsa 0.9.1 (git+https://github.com/matklad/salsa?branch=panic-hooks)", 750 "salsa 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
751 "test_utils 0.1.0", 751 "test_utils 0.1.0",
752 "unicase 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", 752 "unicase 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
753] 753]
@@ -809,7 +809,7 @@ dependencies = [
809 "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", 809 "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
810 "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", 810 "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
811 "ra_text_edit 0.1.0", 811 "ra_text_edit 0.1.0",
812 "rowan 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", 812 "rowan 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
813 "smol_str 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", 813 "smol_str 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
814 "test_utils 0.1.0", 814 "test_utils 0.1.0",
815 "text_unit 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", 815 "text_unit 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -847,7 +847,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
847dependencies = [ 847dependencies = [
848 "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", 848 "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
849 "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", 849 "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
850 "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", 850 "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
851 "rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", 851 "rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
852 "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", 852 "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
853] 853]
@@ -858,7 +858,7 @@ version = "0.6.4"
858source = "registry+https://github.com/rust-lang/crates.io-index" 858source = "registry+https://github.com/rust-lang/crates.io-index"
859dependencies = [ 859dependencies = [
860 "autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", 860 "autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
861 "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", 861 "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
862 "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", 862 "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
863 "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", 863 "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
864 "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", 864 "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -914,7 +914,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
914dependencies = [ 914dependencies = [
915 "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", 915 "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
916 "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", 916 "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
917 "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", 917 "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
918 "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", 918 "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
919 "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", 919 "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
920 "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", 920 "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -954,7 +954,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
954dependencies = [ 954dependencies = [
955 "crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", 955 "crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
956 "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", 956 "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
957 "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", 957 "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
958 "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)", 958 "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
959] 959]
960 960
@@ -1024,7 +1024,7 @@ dependencies = [
1024 1024
1025[[package]] 1025[[package]]
1026name = "rowan" 1026name = "rowan"
1027version = "0.3.0" 1027version = "0.3.1"
1028source = "registry+https://github.com/rust-lang/crates.io-index" 1028source = "registry+https://github.com/rust-lang/crates.io-index"
1029dependencies = [ 1029dependencies = [
1030 "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", 1030 "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1071,8 +1071,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1071 1071
1072[[package]] 1072[[package]]
1073name = "salsa" 1073name = "salsa"
1074version = "0.9.1" 1074version = "0.9.2"
1075source = "git+https://github.com/matklad/salsa?branch=panic-hooks#88313c80302c831ebc7601912ab3f11ad37e6bc2" 1075source = "registry+https://github.com/rust-lang/crates.io-index"
1076dependencies = [ 1076dependencies = [
1077 "derive-new 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", 1077 "derive-new 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
1078 "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", 1078 "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1125,7 +1125,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1125dependencies = [ 1125dependencies = [
1126 "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", 1126 "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
1127 "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", 1127 "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
1128 "syn 0.15.24 (registry+https://github.com/rust-lang/crates.io-index)", 1128 "syn 0.15.25 (registry+https://github.com/rust-lang/crates.io-index)",
1129] 1129]
1130 1130
1131[[package]] 1131[[package]]
@@ -1190,7 +1190,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1190 1190
1191[[package]] 1191[[package]]
1192name = "syn" 1192name = "syn"
1193version = "0.15.24" 1193version = "0.15.25"
1194source = "registry+https://github.com/rust-lang/crates.io-index" 1194source = "registry+https://github.com/rust-lang/crates.io-index"
1195dependencies = [ 1195dependencies = [
1196 "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", 1196 "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1205,7 +1205,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1205dependencies = [ 1205dependencies = [
1206 "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", 1206 "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
1207 "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", 1207 "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
1208 "syn 0.15.24 (registry+https://github.com/rust-lang/crates.io-index)", 1208 "syn 0.15.25 (registry+https://github.com/rust-lang/crates.io-index)",
1209 "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", 1209 "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
1210] 1210]
1211 1211
@@ -1215,7 +1215,7 @@ version = "3.0.5"
1215source = "registry+https://github.com/rust-lang/crates.io-index" 1215source = "registry+https://github.com/rust-lang/crates.io-index"
1216dependencies = [ 1216dependencies = [
1217 "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", 1217 "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
1218 "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", 1218 "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
1219 "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", 1219 "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
1220 "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)", 1220 "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)",
1221 "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", 1221 "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1258,7 +1258,7 @@ name = "termion"
1258version = "1.5.1" 1258version = "1.5.1"
1259source = "registry+https://github.com/rust-lang/crates.io-index" 1259source = "registry+https://github.com/rust-lang/crates.io-index"
1260dependencies = [ 1260dependencies = [
1261 "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", 1261 "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
1262 "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)", 1262 "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)",
1263 "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", 1263 "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
1264] 1264]
@@ -1268,7 +1268,7 @@ name = "termios"
1268version = "0.3.1" 1268version = "0.3.1"
1269source = "registry+https://github.com/rust-lang/crates.io-index" 1269source = "registry+https://github.com/rust-lang/crates.io-index"
1270dependencies = [ 1270dependencies = [
1271 "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", 1271 "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
1272] 1272]
1273 1273
1274[[package]] 1274[[package]]
@@ -1327,7 +1327,7 @@ name = "time"
1327version = "0.1.42" 1327version = "0.1.42"
1328source = "registry+https://github.com/rust-lang/crates.io-index" 1328source = "registry+https://github.com/rust-lang/crates.io-index"
1329dependencies = [ 1329dependencies = [
1330 "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", 1330 "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
1331 "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)", 1331 "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)",
1332 "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", 1332 "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
1333] 1333]
@@ -1490,7 +1490,7 @@ name = "wait-timeout"
1490version = "0.1.5" 1490version = "0.1.5"
1491source = "registry+https://github.com/rust-lang/crates.io-index" 1491source = "registry+https://github.com/rust-lang/crates.io-index"
1492dependencies = [ 1492dependencies = [
1493 "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", 1493 "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
1494] 1494]
1495 1495
1496[[package]] 1496[[package]]
@@ -1588,7 +1588,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1588"checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b" 1588"checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b"
1589"checksum join_to_string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4dc7a5290e8c2606ce2be49f456d50f69173cb96d1541e4f66e34ac8b331a98f" 1589"checksum join_to_string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4dc7a5290e8c2606ce2be49f456d50f69173cb96d1541e4f66e34ac8b331a98f"
1590"checksum lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1" 1590"checksum lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1"
1591"checksum libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)" = "023a4cd09b2ff695f9734c1934145a315594b7986398496841c7031a5a1bbdbd" 1591"checksum libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)" = "48450664a984b25d5b479554c29cc04e3150c97aa4c01da5604a2d4ed9151476"
1592"checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" 1592"checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
1593"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" 1593"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
1594"checksum lsp-types 0.54.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a252cc2be87d9329dd91c505a951996b3263582ba304870960faaae77b642183" 1594"checksum lsp-types 0.54.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a252cc2be87d9329dd91c505a951996b3263582ba304870960faaae77b642183"
@@ -1634,13 +1634,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1634"checksum relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0e7790c7f1cc73d831d28dc5a7deb316a006e7848e6a7f467cdb10a0a9e0fb1c" 1634"checksum relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0e7790c7f1cc73d831d28dc5a7deb316a006e7848e6a7f467cdb10a0a9e0fb1c"
1635"checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5" 1635"checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5"
1636"checksum ron 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d9cb28ade964585205aaca1f3d41a6297f72e1ad097b49c4bbde033ef86b38d7" 1636"checksum ron 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d9cb28ade964585205aaca1f3d41a6297f72e1ad097b49c4bbde033ef86b38d7"
1637"checksum rowan 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4df666a130f870e6ac76fa525b0b6d984cfeee8f4cd675f2a125f0aced79c5f7" 1637"checksum rowan 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "660069534501214380ab070b979f4b41e8cf3a5279ae07d0e949675efbd595bd"
1638"checksum rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619" 1638"checksum rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619"
1639"checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8" 1639"checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8"
1640"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" 1640"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
1641"checksum rusty-fork 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9591f190d2852720b679c21f66ad929f9f1d7bb09d1193c26167586029d8489c" 1641"checksum rusty-fork 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9591f190d2852720b679c21f66ad929f9f1d7bb09d1193c26167586029d8489c"
1642"checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7" 1642"checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7"
1643"checksum salsa 0.9.1 (git+https://github.com/matklad/salsa?branch=panic-hooks)" = "<none>" 1643"checksum salsa 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c73fd43ecb8ec5fbe64828ced981075b828109f011620d0fa1b66e9e983ceb84"
1644"checksum same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8f20c4be53a8a1ff4c1f1b2bd14570d2f634628709752f0702ecdd2b3f9a5267" 1644"checksum same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8f20c4be53a8a1ff4c1f1b2bd14570d2f634628709752f0702ecdd2b3f9a5267"
1645"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" 1645"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
1646"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" 1646"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
@@ -1655,7 +1655,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1655"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" 1655"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
1656"checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550" 1656"checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550"
1657"checksum superslice 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b50b13d42370e0f5fc62eafdd5c2d20065eaf5458dab215ff3e20e63eea96b30" 1657"checksum superslice 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b50b13d42370e0f5fc62eafdd5c2d20065eaf5458dab215ff3e20e63eea96b30"
1658"checksum syn 0.15.24 (registry+https://github.com/rust-lang/crates.io-index)" = "734ecc29cd36e8123850d9bf21dfd62ef8300aaa8f879aabaa899721808be37c" 1658"checksum syn 0.15.25 (registry+https://github.com/rust-lang/crates.io-index)" = "71b7693d9626935a362a3d1d4e59380800a919ebfa478d77a4f49e2a6d2c3ad5"
1659"checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015" 1659"checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015"
1660"checksum tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "7e91405c14320e5c79b3d148e1c86f40749a36e490642202a31689cb1a3452b2" 1660"checksum tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "7e91405c14320e5c79b3d148e1c86f40749a36e490642202a31689cb1a3452b2"
1661"checksum tera 0.11.20 (registry+https://github.com/rust-lang/crates.io-index)" = "4b505279e19d8f7d24b1a9dc58327c9c36174b1a2c7ebdeac70792d017cb64f3" 1661"checksum tera 0.11.20 (registry+https://github.com/rust-lang/crates.io-index)" = "4b505279e19d8f7d24b1a9dc58327c9c36174b1a2c7ebdeac70792d017cb64f3"
diff --git a/Cargo.toml b/Cargo.toml
index 59ce6b23d..c5155e899 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,4 +6,3 @@ incremental = true
6debug = true 6debug = true
7 7
8[patch.'crates-io'] 8[patch.'crates-io']
9salsa = { git = "https://github.com/matklad/salsa", branch = "panic-hooks" }
diff --git a/crates/ra_db/Cargo.toml b/crates/ra_db/Cargo.toml
index 2c1f94ad0..21d987688 100644
--- a/crates/ra_db/Cargo.toml
+++ b/crates/ra_db/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["Aleksey Kladov <[email protected]>"]
6 6
7[dependencies] 7[dependencies]
8relative-path = "0.4.0" 8relative-path = "0.4.0"
9salsa = "0.9.1" 9salsa = "0.9.2"
10rustc-hash = "1.0" 10rustc-hash = "1.0"
11parking_lot = "0.7.0" 11parking_lot = "0.7.0"
12ra_arena = { path = "../ra_arena" } 12ra_arena = { path = "../ra_arena" }
diff --git a/crates/ra_db/src/lib.rs b/crates/ra_db/src/lib.rs
index 0c4dfc8c6..0e7f32e66 100644
--- a/crates/ra_db/src/lib.rs
+++ b/crates/ra_db/src/lib.rs
@@ -22,8 +22,9 @@ pub use crate::{
22 22
23pub trait BaseDatabase: salsa::Database + panic::RefUnwindSafe { 23pub trait BaseDatabase: salsa::Database + panic::RefUnwindSafe {
24 fn check_canceled(&self) -> Cancelable<()> { 24 fn check_canceled(&self) -> Cancelable<()> {
25 self.salsa_runtime() 25 if self.salsa_runtime().is_current_revision_canceled() {
26 .if_current_revision_is_canceled(Canceled::throw); 26 Canceled::throw()
27 }
27 Ok(()) 28 Ok(())
28 } 29 }
29 30
diff --git a/crates/ra_hir/Cargo.toml b/crates/ra_hir/Cargo.toml
index 0135e0e16..415848f09 100644
--- a/crates/ra_hir/Cargo.toml
+++ b/crates/ra_hir/Cargo.toml
@@ -8,7 +8,7 @@ authors = ["Aleksey Kladov <[email protected]>"]
8arrayvec = "0.4.10" 8arrayvec = "0.4.10"
9log = "0.4.5" 9log = "0.4.5"
10relative-path = "0.4.0" 10relative-path = "0.4.0"
11salsa = "0.9.1" 11salsa = "0.9.2"
12rustc-hash = "1.0" 12rustc-hash = "1.0"
13parking_lot = "0.7.0" 13parking_lot = "0.7.0"
14ena = "0.11" 14ena = "0.11"
diff --git a/crates/ra_ide_api/Cargo.toml b/crates/ra_ide_api/Cargo.toml
index f7013c3c1..022cbd5a3 100644
--- a/crates/ra_ide_api/Cargo.toml
+++ b/crates/ra_ide_api/Cargo.toml
@@ -10,7 +10,7 @@ log = "0.4.5"
10relative-path = "0.4.0" 10relative-path = "0.4.0"
11rayon = "1.0.2" 11rayon = "1.0.2"
12fst = "0.3.1" 12fst = "0.3.1"
13salsa = "0.9.1" 13salsa = "0.9.2"
14rustc-hash = "1.0" 14rustc-hash = "1.0"
15parking_lot = "0.7.0" 15parking_lot = "0.7.0"
16unicase = "2.2.0" 16unicase = "2.2.0"
diff --git a/crates/ra_syntax/Cargo.toml b/crates/ra_syntax/Cargo.toml
index 77cd6c804..05cf41a8d 100644
--- a/crates/ra_syntax/Cargo.toml
+++ b/crates/ra_syntax/Cargo.toml
@@ -13,7 +13,7 @@ unicode-xid = "0.1.0"
13itertools = "0.8.0" 13itertools = "0.8.0"
14drop_bomb = "0.1.4" 14drop_bomb = "0.1.4"
15parking_lot = "0.7.0" 15parking_lot = "0.7.0"
16rowan = "0.3.0" 16rowan = "0.3.1"
17 17
18# ideally, `serde` should be enabled by `ra_lsp_serder`, but we enable it here 18# ideally, `serde` should be enabled by `ra_lsp_serder`, but we enable it here
19# to reduce number of compilations 19# to reduce number of compilations