diff options
-rw-r--r-- | Cargo.lock | 123 | ||||
-rw-r--r-- | crates/ra_db/Cargo.toml | 3 | ||||
-rw-r--r-- | crates/ra_db/src/lib.rs | 4 | ||||
-rw-r--r-- | crates/ra_hir/Cargo.toml | 1 | ||||
-rw-r--r-- | crates/ra_hir/src/db.rs | 2 | ||||
-rw-r--r-- | crates/ra_hir/src/mock.rs | 8 | ||||
-rw-r--r-- | crates/ra_ide_api/Cargo.toml | 1 | ||||
-rw-r--r-- | crates/ra_ide_api/src/db.rs | 12 | ||||
-rw-r--r-- | crates/ra_ide_api/src/imp.rs | 10 | ||||
-rw-r--r-- | crates/ra_ide_api/src/symbol_index.rs | 2 |
10 files changed, 88 insertions, 78 deletions
diff --git a/Cargo.lock b/Cargo.lock index a8113a87d..3b8df0c8a 100644 --- a/Cargo.lock +++ b/Cargo.lock | |||
@@ -32,7 +32,7 @@ name = "atty" | |||
32 | version = "0.2.11" | 32 | version = "0.2.11" |
33 | source = "registry+https://github.com/rust-lang/crates.io-index" | 33 | source = "registry+https://github.com/rust-lang/crates.io-index" |
34 | dependencies = [ | 34 | dependencies = [ |
35 | "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", | 35 | "libc 0.2.48 (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.2 (registry+https://github.com/rust-lang/crates.io-index)", | 50 | "autocfg 0.1.2 (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.47 (registry+https://github.com/rust-lang/crates.io-index)", | 53 | "libc 0.2.48 (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,12 +61,12 @@ version = "0.1.28" | |||
61 | source = "registry+https://github.com/rust-lang/crates.io-index" | 61 | source = "registry+https://github.com/rust-lang/crates.io-index" |
62 | dependencies = [ | 62 | dependencies = [ |
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.47 (registry+https://github.com/rust-lang/crates.io-index)", | 64 | "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", |
65 | ] | 65 | ] |
66 | 66 | ||
67 | [[package]] | 67 | [[package]] |
68 | name = "base64" | 68 | name = "base64" |
69 | version = "0.10.0" | 69 | version = "0.10.1" |
70 | source = "registry+https://github.com/rust-lang/crates.io-index" | 70 | source = "registry+https://github.com/rust-lang/crates.io-index" |
71 | dependencies = [ | 71 | dependencies = [ |
72 | "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", | 72 | "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", |
@@ -111,14 +111,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
111 | 111 | ||
112 | [[package]] | 112 | [[package]] |
113 | name = "cargo_metadata" | 113 | name = "cargo_metadata" |
114 | version = "0.7.0" | 114 | version = "0.7.1" |
115 | source = "registry+https://github.com/rust-lang/crates.io-index" | 115 | source = "registry+https://github.com/rust-lang/crates.io-index" |
116 | dependencies = [ | 116 | dependencies = [ |
117 | "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", | 117 | "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", |
118 | "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", | 118 | "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", |
119 | "serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)", | 119 | "serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)", |
120 | "serde_derive 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)", | 120 | "serde_derive 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)", |
121 | "serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)", | 121 | "serde_json 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", |
122 | ] | 122 | ] |
123 | 123 | ||
124 | [[package]] | 124 | [[package]] |
@@ -167,7 +167,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
167 | dependencies = [ | 167 | dependencies = [ |
168 | "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", | 168 | "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", |
169 | "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", | 169 | "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", |
170 | "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", | 170 | "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", |
171 | "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", | 171 | "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", |
172 | ] | 172 | ] |
173 | 173 | ||
@@ -188,7 +188,7 @@ dependencies = [ | |||
188 | "clicolors-control 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", | 188 | "clicolors-control 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", |
189 | "encode_unicode 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", | 189 | "encode_unicode 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", |
190 | "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", | 190 | "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", |
191 | "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", | 191 | "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", |
192 | "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", | 192 | "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", |
193 | "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", | 193 | "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", |
194 | "termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", | 194 | "termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", |
@@ -381,9 +381,9 @@ dependencies = [ | |||
381 | "crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", | 381 | "crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", |
382 | "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", | 382 | "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", |
383 | "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", | 383 | "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", |
384 | "lsp-types 0.55.0 (registry+https://github.com/rust-lang/crates.io-index)", | 384 | "lsp-types 0.55.1 (registry+https://github.com/rust-lang/crates.io-index)", |
385 | "serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)", | 385 | "serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)", |
386 | "serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)", | 386 | "serde_json 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", |
387 | ] | 387 | ] |
388 | 388 | ||
389 | [[package]] | 389 | [[package]] |
@@ -451,7 +451,7 @@ dependencies = [ | |||
451 | "pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", | 451 | "pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", |
452 | "ron 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", | 452 | "ron 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", |
453 | "serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)", | 453 | "serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)", |
454 | "serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)", | 454 | "serde_json 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", |
455 | "serde_yaml 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)", | 455 | "serde_yaml 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)", |
456 | ] | 456 | ] |
457 | 457 | ||
@@ -480,7 +480,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
480 | 480 | ||
481 | [[package]] | 481 | [[package]] |
482 | name = "libc" | 482 | name = "libc" |
483 | version = "0.2.47" | 483 | version = "0.2.48" |
484 | source = "registry+https://github.com/rust-lang/crates.io-index" | 484 | source = "registry+https://github.com/rust-lang/crates.io-index" |
485 | 485 | ||
486 | [[package]] | 486 | [[package]] |
@@ -507,7 +507,7 @@ dependencies = [ | |||
507 | 507 | ||
508 | [[package]] | 508 | [[package]] |
509 | name = "lsp-types" | 509 | name = "lsp-types" |
510 | version = "0.55.0" | 510 | version = "0.55.1" |
511 | source = "registry+https://github.com/rust-lang/crates.io-index" | 511 | source = "registry+https://github.com/rust-lang/crates.io-index" |
512 | dependencies = [ | 512 | dependencies = [ |
513 | "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", | 513 | "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", |
@@ -515,7 +515,7 @@ dependencies = [ | |||
515 | "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", | 515 | "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", |
516 | "serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)", | 516 | "serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)", |
517 | "serde_derive 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)", | 517 | "serde_derive 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)", |
518 | "serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)", | 518 | "serde_json 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", |
519 | "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", | 519 | "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", |
520 | "url_serde 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", | 520 | "url_serde 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", |
521 | ] | 521 | ] |
@@ -536,7 +536,7 @@ version = "2.1.3" | |||
536 | source = "registry+https://github.com/rust-lang/crates.io-index" | 536 | source = "registry+https://github.com/rust-lang/crates.io-index" |
537 | dependencies = [ | 537 | dependencies = [ |
538 | "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", | 538 | "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", |
539 | "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", | 539 | "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", |
540 | ] | 540 | ] |
541 | 541 | ||
542 | [[package]] | 542 | [[package]] |
@@ -544,7 +544,7 @@ name = "memmap" | |||
544 | version = "0.6.2" | 544 | version = "0.6.2" |
545 | source = "registry+https://github.com/rust-lang/crates.io-index" | 545 | source = "registry+https://github.com/rust-lang/crates.io-index" |
546 | dependencies = [ | 546 | dependencies = [ |
547 | "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", | 547 | "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", |
548 | "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", | 548 | "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", |
549 | ] | 549 | ] |
550 | 550 | ||
@@ -587,7 +587,7 @@ name = "num_cpus" | |||
587 | version = "1.9.0" | 587 | version = "1.9.0" |
588 | source = "registry+https://github.com/rust-lang/crates.io-index" | 588 | source = "registry+https://github.com/rust-lang/crates.io-index" |
589 | dependencies = [ | 589 | dependencies = [ |
590 | "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", | 590 | "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", |
591 | ] | 591 | ] |
592 | 592 | ||
593 | [[package]] | 593 | [[package]] |
@@ -612,7 +612,7 @@ name = "parking_lot_core" | |||
612 | version = "0.4.0" | 612 | version = "0.4.0" |
613 | source = "registry+https://github.com/rust-lang/crates.io-index" | 613 | source = "registry+https://github.com/rust-lang/crates.io-index" |
614 | dependencies = [ | 614 | dependencies = [ |
615 | "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", | 615 | "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", |
616 | "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", | 616 | "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", |
617 | "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", | 617 | "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", |
618 | "smallvec 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)", | 618 | "smallvec 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)", |
@@ -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.10.0-alpha3 (registry+https://github.com/rust-lang/crates.io-index)", | 729 | "salsa 0.10.0-alpha4 (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 | ||
@@ -746,7 +746,6 @@ dependencies = [ | |||
746 | "ra_syntax 0.1.0", | 746 | "ra_syntax 0.1.0", |
747 | "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", | 747 | "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", |
748 | "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", | 748 | "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", |
749 | "salsa 0.10.0-alpha3 (registry+https://github.com/rust-lang/crates.io-index)", | ||
750 | "test_utils 0.1.0", | 749 | "test_utils 0.1.0", |
751 | ] | 750 | ] |
752 | 751 | ||
@@ -768,7 +767,6 @@ dependencies = [ | |||
768 | "rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", | 767 | "rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", |
769 | "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", | 768 | "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", |
770 | "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", | 769 | "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", |
771 | "salsa 0.10.0-alpha3 (registry+https://github.com/rust-lang/crates.io-index)", | ||
772 | "test_utils 0.1.0", | 770 | "test_utils 0.1.0", |
773 | "unicase 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", | 771 | "unicase 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", |
774 | ] | 772 | ] |
@@ -792,7 +790,7 @@ dependencies = [ | |||
792 | name = "ra_lsp_server" | 790 | name = "ra_lsp_server" |
793 | version = "0.1.0" | 791 | version = "0.1.0" |
794 | dependencies = [ | 792 | dependencies = [ |
795 | "cargo_metadata 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", | 793 | "cargo_metadata 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", |
796 | "crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", | 794 | "crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", |
797 | "drop_bomb 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", | 795 | "drop_bomb 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", |
798 | "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", | 796 | "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", |
@@ -801,7 +799,7 @@ dependencies = [ | |||
801 | "gen_lsp_server 0.1.0", | 799 | "gen_lsp_server 0.1.0", |
802 | "im 12.3.0 (registry+https://github.com/rust-lang/crates.io-index)", | 800 | "im 12.3.0 (registry+https://github.com/rust-lang/crates.io-index)", |
803 | "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", | 801 | "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", |
804 | "lsp-types 0.55.0 (registry+https://github.com/rust-lang/crates.io-index)", | 802 | "lsp-types 0.55.1 (registry+https://github.com/rust-lang/crates.io-index)", |
805 | "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", | 803 | "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", |
806 | "ra_arena 0.1.0", | 804 | "ra_arena 0.1.0", |
807 | "ra_ide_api 0.1.0", | 805 | "ra_ide_api 0.1.0", |
@@ -811,7 +809,7 @@ dependencies = [ | |||
811 | "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", | 809 | "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", |
812 | "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", | 810 | "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", |
813 | "serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)", | 811 | "serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)", |
814 | "serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)", | 812 | "serde_json 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", |
815 | "tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)", | 813 | "tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)", |
816 | "test_utils 0.1.0", | 814 | "test_utils 0.1.0", |
817 | "thread_worker 0.1.0", | 815 | "thread_worker 0.1.0", |
@@ -867,7 +865,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
867 | dependencies = [ | 865 | dependencies = [ |
868 | "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", | 866 | "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", |
869 | "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", | 867 | "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", |
870 | "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", | 868 | "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", |
871 | "rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", | 869 | "rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", |
872 | "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", | 870 | "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", |
873 | ] | 871 | ] |
@@ -878,9 +876,9 @@ version = "0.6.4" | |||
878 | source = "registry+https://github.com/rust-lang/crates.io-index" | 876 | source = "registry+https://github.com/rust-lang/crates.io-index" |
879 | dependencies = [ | 877 | dependencies = [ |
880 | "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", | 878 | "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", |
881 | "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", | 879 | "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", |
882 | "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", | 880 | "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", |
883 | "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", | 881 | "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", |
884 | "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", | 882 | "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", |
885 | "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", | 883 | "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", |
886 | "rand_os 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", | 884 | "rand_os 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", |
@@ -895,7 +893,7 @@ version = "0.1.1" | |||
895 | source = "registry+https://github.com/rust-lang/crates.io-index" | 893 | source = "registry+https://github.com/rust-lang/crates.io-index" |
896 | dependencies = [ | 894 | dependencies = [ |
897 | "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", | 895 | "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", |
898 | "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", | 896 | "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", |
899 | ] | 897 | ] |
900 | 898 | ||
901 | [[package]] | 899 | [[package]] |
@@ -903,12 +901,20 @@ name = "rand_core" | |||
903 | version = "0.2.2" | 901 | version = "0.2.2" |
904 | source = "registry+https://github.com/rust-lang/crates.io-index" | 902 | source = "registry+https://github.com/rust-lang/crates.io-index" |
905 | dependencies = [ | 903 | dependencies = [ |
906 | "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", | 904 | "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", |
905 | ] | ||
906 | |||
907 | [[package]] | ||
908 | name = "rand_core" | ||
909 | version = "0.3.1" | ||
910 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
911 | dependencies = [ | ||
912 | "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", | ||
907 | ] | 913 | ] |
908 | 914 | ||
909 | [[package]] | 915 | [[package]] |
910 | name = "rand_core" | 916 | name = "rand_core" |
911 | version = "0.3.0" | 917 | version = "0.4.0" |
912 | source = "registry+https://github.com/rust-lang/crates.io-index" | 918 | source = "registry+https://github.com/rust-lang/crates.io-index" |
913 | 919 | ||
914 | [[package]] | 920 | [[package]] |
@@ -916,7 +922,7 @@ name = "rand_hc" | |||
916 | version = "0.1.0" | 922 | version = "0.1.0" |
917 | source = "registry+https://github.com/rust-lang/crates.io-index" | 923 | source = "registry+https://github.com/rust-lang/crates.io-index" |
918 | dependencies = [ | 924 | dependencies = [ |
919 | "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", | 925 | "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", |
920 | ] | 926 | ] |
921 | 927 | ||
922 | [[package]] | 928 | [[package]] |
@@ -924,7 +930,7 @@ name = "rand_isaac" | |||
924 | version = "0.1.1" | 930 | version = "0.1.1" |
925 | source = "registry+https://github.com/rust-lang/crates.io-index" | 931 | source = "registry+https://github.com/rust-lang/crates.io-index" |
926 | dependencies = [ | 932 | dependencies = [ |
927 | "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", | 933 | "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", |
928 | ] | 934 | ] |
929 | 935 | ||
930 | [[package]] | 936 | [[package]] |
@@ -934,8 +940,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
934 | dependencies = [ | 940 | dependencies = [ |
935 | "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", | 941 | "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", |
936 | "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", | 942 | "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", |
937 | "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", | 943 | "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", |
938 | "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", | 944 | "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", |
939 | "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", | 945 | "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", |
940 | "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", | 946 | "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", |
941 | ] | 947 | ] |
@@ -945,7 +951,7 @@ name = "rand_pcg" | |||
945 | version = "0.1.1" | 951 | version = "0.1.1" |
946 | source = "registry+https://github.com/rust-lang/crates.io-index" | 952 | source = "registry+https://github.com/rust-lang/crates.io-index" |
947 | dependencies = [ | 953 | dependencies = [ |
948 | "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", | 954 | "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", |
949 | "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", | 955 | "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", |
950 | ] | 956 | ] |
951 | 957 | ||
@@ -954,7 +960,7 @@ name = "rand_xorshift" | |||
954 | version = "0.1.1" | 960 | version = "0.1.1" |
955 | source = "registry+https://github.com/rust-lang/crates.io-index" | 961 | source = "registry+https://github.com/rust-lang/crates.io-index" |
956 | dependencies = [ | 962 | dependencies = [ |
957 | "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", | 963 | "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", |
958 | ] | 964 | ] |
959 | 965 | ||
960 | [[package]] | 966 | [[package]] |
@@ -974,7 +980,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
974 | dependencies = [ | 980 | dependencies = [ |
975 | "crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", | 981 | "crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", |
976 | "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", | 982 | "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", |
977 | "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", | 983 | "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", |
978 | "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)", | 984 | "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)", |
979 | ] | 985 | ] |
980 | 986 | ||
@@ -983,7 +989,7 @@ name = "rdrand" | |||
983 | version = "0.4.0" | 989 | version = "0.4.0" |
984 | source = "registry+https://github.com/rust-lang/crates.io-index" | 990 | source = "registry+https://github.com/rust-lang/crates.io-index" |
985 | dependencies = [ | 991 | dependencies = [ |
986 | "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", | 992 | "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", |
987 | ] | 993 | ] |
988 | 994 | ||
989 | [[package]] | 995 | [[package]] |
@@ -1037,7 +1043,7 @@ name = "ron" | |||
1037 | version = "0.4.1" | 1043 | version = "0.4.1" |
1038 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1044 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1039 | dependencies = [ | 1045 | dependencies = [ |
1040 | "base64 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", | 1046 | "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", |
1041 | "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", | 1047 | "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", |
1042 | "serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)", | 1048 | "serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)", |
1043 | ] | 1049 | ] |
@@ -1091,7 +1097,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
1091 | 1097 | ||
1092 | [[package]] | 1098 | [[package]] |
1093 | name = "salsa" | 1099 | name = "salsa" |
1094 | version = "0.10.0-alpha3" | 1100 | version = "0.10.0-alpha4" |
1095 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1101 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1096 | dependencies = [ | 1102 | dependencies = [ |
1097 | "derive-new 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", | 1103 | "derive-new 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", |
@@ -1100,13 +1106,13 @@ dependencies = [ | |||
1100 | "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", | 1106 | "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", |
1101 | "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", | 1107 | "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", |
1102 | "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", | 1108 | "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", |
1103 | "salsa-macros 0.10.0-alpha3 (registry+https://github.com/rust-lang/crates.io-index)", | 1109 | "salsa-macros 0.10.0-alpha4 (registry+https://github.com/rust-lang/crates.io-index)", |
1104 | "smallvec 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)", | 1110 | "smallvec 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)", |
1105 | ] | 1111 | ] |
1106 | 1112 | ||
1107 | [[package]] | 1113 | [[package]] |
1108 | name = "salsa-macros" | 1114 | name = "salsa-macros" |
1109 | version = "0.10.0-alpha3" | 1115 | version = "0.10.0-alpha4" |
1110 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1116 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1111 | dependencies = [ | 1117 | dependencies = [ |
1112 | "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", | 1118 | "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", |
@@ -1162,7 +1168,7 @@ dependencies = [ | |||
1162 | 1168 | ||
1163 | [[package]] | 1169 | [[package]] |
1164 | name = "serde_json" | 1170 | name = "serde_json" |
1165 | version = "1.0.36" | 1171 | version = "1.0.37" |
1166 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1172 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1167 | dependencies = [ | 1173 | dependencies = [ |
1168 | "itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", | 1174 | "itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", |
@@ -1258,7 +1264,7 @@ version = "3.0.5" | |||
1258 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1264 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1259 | dependencies = [ | 1265 | dependencies = [ |
1260 | "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", | 1266 | "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", |
1261 | "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", | 1267 | "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", |
1262 | "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", | 1268 | "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", |
1263 | "redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)", | 1269 | "redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)", |
1264 | "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", | 1270 | "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", |
@@ -1279,7 +1285,7 @@ dependencies = [ | |||
1279 | "pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", | 1285 | "pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", |
1280 | "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", | 1286 | "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", |
1281 | "serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)", | 1287 | "serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)", |
1282 | "serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)", | 1288 | "serde_json 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", |
1283 | "slug 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", | 1289 | "slug 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", |
1284 | "unic-segment 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", | 1290 | "unic-segment 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", |
1285 | "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", | 1291 | "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", |
@@ -1301,7 +1307,7 @@ name = "termion" | |||
1301 | version = "1.5.1" | 1307 | version = "1.5.1" |
1302 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1308 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1303 | dependencies = [ | 1309 | dependencies = [ |
1304 | "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", | 1310 | "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", |
1305 | "redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)", | 1311 | "redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)", |
1306 | "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", | 1312 | "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", |
1307 | ] | 1313 | ] |
@@ -1311,7 +1317,7 @@ name = "termios" | |||
1311 | version = "0.3.1" | 1317 | version = "0.3.1" |
1312 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1318 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1313 | dependencies = [ | 1319 | dependencies = [ |
1314 | "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", | 1320 | "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", |
1315 | ] | 1321 | ] |
1316 | 1322 | ||
1317 | [[package]] | 1323 | [[package]] |
@@ -1320,7 +1326,7 @@ version = "0.1.0" | |||
1320 | dependencies = [ | 1326 | dependencies = [ |
1321 | "difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", | 1327 | "difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", |
1322 | "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", | 1328 | "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", |
1323 | "serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)", | 1329 | "serde_json 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", |
1324 | "text_unit 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", | 1330 | "text_unit 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", |
1325 | ] | 1331 | ] |
1326 | 1332 | ||
@@ -1370,7 +1376,7 @@ name = "time" | |||
1370 | version = "0.1.42" | 1376 | version = "0.1.42" |
1371 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1377 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1372 | dependencies = [ | 1378 | dependencies = [ |
1373 | "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", | 1379 | "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", |
1374 | "redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)", | 1380 | "redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)", |
1375 | "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", | 1381 | "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", |
1376 | ] | 1382 | ] |
@@ -1536,7 +1542,7 @@ name = "wait-timeout" | |||
1536 | version = "0.1.5" | 1542 | version = "0.1.5" |
1537 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1543 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1538 | dependencies = [ | 1544 | dependencies = [ |
1539 | "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", | 1545 | "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", |
1540 | ] | 1546 | ] |
1541 | 1547 | ||
1542 | [[package]] | 1548 | [[package]] |
@@ -1593,14 +1599,14 @@ dependencies = [ | |||
1593 | "checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799" | 1599 | "checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799" |
1594 | "checksum backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "b5b493b66e03090ebc4343eb02f94ff944e0cbc9ac6571491d170ba026741eb5" | 1600 | "checksum backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "b5b493b66e03090ebc4343eb02f94ff944e0cbc9ac6571491d170ba026741eb5" |
1595 | "checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6" | 1601 | "checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6" |
1596 | "checksum base64 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "621fc7ecb8008f86d7fb9b95356cd692ce9514b80a86d85b397f32a22da7b9e2" | 1602 | "checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" |
1597 | "checksum bit-set 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6f1efcc46c18245a69c38fcc5cc650f16d3a59d034f3106e9ed63748f695730a" | 1603 | "checksum bit-set 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6f1efcc46c18245a69c38fcc5cc650f16d3a59d034f3106e9ed63748f695730a" |
1598 | "checksum bit-vec 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4440d5cb623bb7390ae27fec0bb6c61111969860f8e3ae198bfa0663645e67cf" | 1604 | "checksum bit-vec 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4440d5cb623bb7390ae27fec0bb6c61111969860f8e3ae198bfa0663645e67cf" |
1599 | "checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12" | 1605 | "checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12" |
1600 | "checksum block-buffer 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a076c298b9ecdb530ed9d967e74a6027d6a7478924520acddcddc24c1c8ab3ab" | 1606 | "checksum block-buffer 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a076c298b9ecdb530ed9d967e74a6027d6a7478924520acddcddc24c1c8ab3ab" |
1601 | "checksum byte-tools 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "560c32574a12a89ecd91f5e742165893f86e3ab98d21f8ea548658eb9eef5f40" | 1607 | "checksum byte-tools 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "560c32574a12a89ecd91f5e742165893f86e3ab98d21f8ea548658eb9eef5f40" |
1602 | "checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb" | 1608 | "checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb" |
1603 | "checksum cargo_metadata 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "95932a7ed5f2308fc00a46d2aa8eb1b06b402c896c2df424916ee730ba610c2e" | 1609 | "checksum cargo_metadata 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "585784cac9b05c93a53b17a0b24a5cdd1dfdda5256f030e089b549d2390cc720" |
1604 | "checksum cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4a8b715cb4597106ea87c7c84b2f1d452c7492033765df7f32651e66fcf749" | 1610 | "checksum cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4a8b715cb4597106ea87c7c84b2f1d452c7492033765df7f32651e66fcf749" |
1605 | "checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4" | 1611 | "checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4" |
1606 | "checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878" | 1612 | "checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878" |
@@ -1644,11 +1650,11 @@ dependencies = [ | |||
1644 | "checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b" | 1650 | "checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b" |
1645 | "checksum join_to_string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4dc7a5290e8c2606ce2be49f456d50f69173cb96d1541e4f66e34ac8b331a98f" | 1651 | "checksum join_to_string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4dc7a5290e8c2606ce2be49f456d50f69173cb96d1541e4f66e34ac8b331a98f" |
1646 | "checksum lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1" | 1652 | "checksum lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1" |
1647 | "checksum libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)" = "48450664a984b25d5b479554c29cc04e3150c97aa4c01da5604a2d4ed9151476" | 1653 | "checksum libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)" = "e962c7641008ac010fa60a7dfdc1712449f29c44ef2d4702394aea943ee75047" |
1648 | "checksum linked-hash-map 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "70fb39025bc7cdd76305867c4eccf2f2dcf6e9a57f5b21a93e1c2d86cd03ec9e" | 1654 | "checksum linked-hash-map 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "70fb39025bc7cdd76305867c4eccf2f2dcf6e9a57f5b21a93e1c2d86cd03ec9e" |
1649 | "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" | 1655 | "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" |
1650 | "checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" | 1656 | "checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" |
1651 | "checksum lsp-types 0.55.0 (registry+https://github.com/rust-lang/crates.io-index)" = "78455d7df2e41e103ccf893abdeb93981f0bbeb228884230e9fc5ff71546fd55" | 1657 | "checksum lsp-types 0.55.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca49aeb430780992121d582520170411658b1e41bf968b917d85fd0fb6da3c5" |
1652 | "checksum maplit 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "08cbb6b4fef96b6d77bfc40ec491b1690c779e77b05cd9f07f787ed376fd4c43" | 1658 | "checksum maplit 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "08cbb6b4fef96b6d77bfc40ec491b1690c779e77b05cd9f07f787ed376fd4c43" |
1653 | "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" | 1659 | "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" |
1654 | "checksum memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e1dd4eaac298c32ce07eb6ed9242eda7d82955b9170b7d6db59b2e02cc63fcb8" | 1660 | "checksum memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e1dd4eaac298c32ce07eb6ed9242eda7d82955b9170b7d6db59b2e02cc63fcb8" |
@@ -1675,7 +1681,8 @@ dependencies = [ | |||
1675 | "checksum rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3906503e80ac6cbcacb2c2973fa8e473f24d7e2747c8c92bb230c2441cad96b5" | 1681 | "checksum rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3906503e80ac6cbcacb2c2973fa8e473f24d7e2747c8c92bb230c2441cad96b5" |
1676 | "checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" | 1682 | "checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" |
1677 | "checksum rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1961a422c4d189dfb50ffa9320bf1f2a9bd54ecb92792fb9477f99a1045f3372" | 1683 | "checksum rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1961a422c4d189dfb50ffa9320bf1f2a9bd54ecb92792fb9477f99a1045f3372" |
1678 | "checksum rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0905b6b7079ec73b314d4c748701f6931eb79fd97c668caa3f1899b22b32c6db" | 1684 | "checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" |
1685 | "checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0" | ||
1679 | "checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" | 1686 | "checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" |
1680 | "checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" | 1687 | "checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" |
1681 | "checksum rand_os 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f46fbd5550acf75b0c2730f5dd1873751daf9beb8f11b44027778fae50d7feca" | 1688 | "checksum rand_os 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f46fbd5550acf75b0c2730f5dd1873751daf9beb8f11b44027778fae50d7feca" |
@@ -1697,15 +1704,15 @@ dependencies = [ | |||
1697 | "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" | 1704 | "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" |
1698 | "checksum rusty-fork 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9591f190d2852720b679c21f66ad929f9f1d7bb09d1193c26167586029d8489c" | 1705 | "checksum rusty-fork 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9591f190d2852720b679c21f66ad929f9f1d7bb09d1193c26167586029d8489c" |
1699 | "checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7" | 1706 | "checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7" |
1700 | "checksum salsa 0.10.0-alpha3 (registry+https://github.com/rust-lang/crates.io-index)" = "135c0977b23f8a9dc16744dd5495989110e3763ba5ea41e386741c7f8901e285" | 1707 | "checksum salsa 0.10.0-alpha4 (registry+https://github.com/rust-lang/crates.io-index)" = "3f442595eae948da8fbb2aa1e13940d9d2d70031753a27a5d1434f91b706ff12" |
1701 | "checksum salsa-macros 0.10.0-alpha3 (registry+https://github.com/rust-lang/crates.io-index)" = "c9c93b5efed7281334c4bed8470b278076d1ccd6a60da59a15cd0d57792afff8" | 1708 | "checksum salsa-macros 0.10.0-alpha4 (registry+https://github.com/rust-lang/crates.io-index)" = "2e6c1a1bee4eb44881438e80c1a26db1c3b957b6cc51765615d429019babdec2" |
1702 | "checksum same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8f20c4be53a8a1ff4c1f1b2bd14570d2f634628709752f0702ecdd2b3f9a5267" | 1709 | "checksum same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8f20c4be53a8a1ff4c1f1b2bd14570d2f634628709752f0702ecdd2b3f9a5267" |
1703 | "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" | 1710 | "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" |
1704 | "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" | 1711 | "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" |
1705 | "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" | 1712 | "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" |
1706 | "checksum serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)" = "534b8b91a95e0f71bca3ed5824752d558da048d4248c91af873b63bd60519752" | 1713 | "checksum serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)" = "534b8b91a95e0f71bca3ed5824752d558da048d4248c91af873b63bd60519752" |
1707 | "checksum serde_derive 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)" = "a915306b0f1ac5607797697148c223bedeaa36bcc2e28a01441cd638cc6567b4" | 1714 | "checksum serde_derive 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)" = "a915306b0f1ac5607797697148c223bedeaa36bcc2e28a01441cd638cc6567b4" |
1708 | "checksum serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)" = "574378d957d6dcdf1bbb5d562a15cbd5e644159432f84634b94e485267abbcc7" | 1715 | "checksum serde_json 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)" = "4b90a9fbe1211e57d3e1c15670f1cb00802988fb23a1a4aad7a2b63544f1920e" |
1709 | "checksum serde_yaml 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)" = "0887a8e097a69559b56aa2526bf7aff7c3048cf627dff781f0b56a6001534593" | 1716 | "checksum serde_yaml 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)" = "0887a8e097a69559b56aa2526bf7aff7c3048cf627dff781f0b56a6001534593" |
1710 | "checksum sha-1 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "51b9d1f3b5de8a167ab06834a7c883bd197f2191e1dda1a22d9ccfeedbf9aded" | 1717 | "checksum sha-1 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "51b9d1f3b5de8a167ab06834a7c883bd197f2191e1dda1a22d9ccfeedbf9aded" |
1711 | "checksum slug 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b3bc762e6a4b6c6fcaade73e77f9ebc6991b676f88bb2358bddb56560f073373" | 1718 | "checksum slug 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b3bc762e6a4b6c6fcaade73e77f9ebc6991b676f88bb2358bddb56560f073373" |
diff --git a/crates/ra_db/Cargo.toml b/crates/ra_db/Cargo.toml index 3568da905..9aa77f72e 100644 --- a/crates/ra_db/Cargo.toml +++ b/crates/ra_db/Cargo.toml | |||
@@ -6,9 +6,10 @@ authors = ["Aleksey Kladov <[email protected]>"] | |||
6 | 6 | ||
7 | [dependencies] | 7 | [dependencies] |
8 | relative-path = "0.4.0" | 8 | relative-path = "0.4.0" |
9 | salsa = "0.10.0-alpha3" | 9 | salsa = "0.10.0-alpha4" |
10 | rustc-hash = "1.0" | 10 | rustc-hash = "1.0" |
11 | parking_lot = "0.7.0" | 11 | parking_lot = "0.7.0" |
12 | |||
12 | ra_arena = { path = "../ra_arena" } | 13 | ra_arena = { path = "../ra_arena" } |
13 | ra_syntax = { path = "../ra_syntax" } | 14 | ra_syntax = { path = "../ra_syntax" } |
14 | test_utils = { path = "../test_utils" } | 15 | test_utils = { path = "../test_utils" } |
diff --git a/crates/ra_db/src/lib.rs b/crates/ra_db/src/lib.rs index 7e13f70bc..3a0aa7d24 100644 --- a/crates/ra_db/src/lib.rs +++ b/crates/ra_db/src/lib.rs | |||
@@ -63,7 +63,7 @@ pub struct FileRange { | |||
63 | pub range: TextRange, | 63 | pub range: TextRange, |
64 | } | 64 | } |
65 | 65 | ||
66 | #[salsa::query_group] | 66 | #[salsa::query_group(FilesDatabaseStorage)] |
67 | pub trait FilesDatabase: salsa::Database { | 67 | pub trait FilesDatabase: salsa::Database { |
68 | /// Text of the file. | 68 | /// Text of the file. |
69 | #[salsa::input] | 69 | #[salsa::input] |
@@ -102,7 +102,7 @@ fn source_root_crates(db: &impl FilesDatabase, id: SourceRootId) -> Arc<Vec<Crat | |||
102 | Arc::new(res) | 102 | Arc::new(res) |
103 | } | 103 | } |
104 | 104 | ||
105 | #[salsa::query_group] | 105 | #[salsa::query_group(SyntaxDatabaseStorage)] |
106 | pub trait SyntaxDatabase: FilesDatabase + BaseDatabase { | 106 | pub trait SyntaxDatabase: FilesDatabase + BaseDatabase { |
107 | fn source_file(&self, file_id: FileId) -> TreeArc<SourceFile>; | 107 | fn source_file(&self, file_id: FileId) -> TreeArc<SourceFile>; |
108 | } | 108 | } |
diff --git a/crates/ra_hir/Cargo.toml b/crates/ra_hir/Cargo.toml index 3d802ade4..57a4b155b 100644 --- a/crates/ra_hir/Cargo.toml +++ b/crates/ra_hir/Cargo.toml | |||
@@ -12,7 +12,6 @@ rustc-hash = "1.0" | |||
12 | parking_lot = "0.7.0" | 12 | parking_lot = "0.7.0" |
13 | ena = "0.11" | 13 | ena = "0.11" |
14 | join_to_string = "0.1.3" | 14 | join_to_string = "0.1.3" |
15 | salsa = "0.10.0-alpha3" | ||
16 | 15 | ||
17 | ra_syntax = { path = "../ra_syntax" } | 16 | ra_syntax = { path = "../ra_syntax" } |
18 | ra_arena = { path = "../ra_arena" } | 17 | ra_arena = { path = "../ra_arena" } |
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs index 3c82262a2..dfbf41bd6 100644 --- a/crates/ra_hir/src/db.rs +++ b/crates/ra_hir/src/db.rs | |||
@@ -18,7 +18,7 @@ use crate::{ | |||
18 | generics::{GenericParams, GenericDef}, | 18 | generics::{GenericParams, GenericDef}, |
19 | }; | 19 | }; |
20 | 20 | ||
21 | #[salsa::query_group] | 21 | #[salsa::query_group(HirDatabaseStorage)] |
22 | pub trait HirDatabase: SyntaxDatabase + AsRef<HirInterner> { | 22 | pub trait HirDatabase: SyntaxDatabase + AsRef<HirInterner> { |
23 | #[salsa::invoke(HirFileId::hir_source_file)] | 23 | #[salsa::invoke(HirFileId::hir_source_file)] |
24 | fn hir_source_file(&self, file_id: HirFileId) -> TreeArc<SourceFile>; | 24 | fn hir_source_file(&self, file_id: HirFileId) -> TreeArc<SourceFile>; |
diff --git a/crates/ra_hir/src/mock.rs b/crates/ra_hir/src/mock.rs index 36b174cd6..2dc252b1e 100644 --- a/crates/ra_hir/src/mock.rs +++ b/crates/ra_hir/src/mock.rs | |||
@@ -2,7 +2,7 @@ use std::{sync::Arc, panic}; | |||
2 | 2 | ||
3 | use parking_lot::Mutex; | 3 | use parking_lot::Mutex; |
4 | use ra_db::{ | 4 | use ra_db::{ |
5 | BaseDatabase, FilePosition, FileId, CrateGraph, SourceRoot, SourceRootId, FilesDatabase, | 5 | BaseDatabase, FilePosition, FileId, CrateGraph, SourceRoot, SourceRootId, FilesDatabase, salsa, |
6 | }; | 6 | }; |
7 | use relative_path::RelativePathBuf; | 7 | use relative_path::RelativePathBuf; |
8 | use test_utils::{parse_fixture, CURSOR_MARKER, extract_offset}; | 8 | use test_utils::{parse_fixture, CURSOR_MARKER, extract_offset}; |
@@ -11,7 +11,11 @@ use crate::{db, HirInterner}; | |||
11 | 11 | ||
12 | pub const WORKSPACE: SourceRootId = SourceRootId(0); | 12 | pub const WORKSPACE: SourceRootId = SourceRootId(0); |
13 | 13 | ||
14 | #[salsa::database(ra_db::FilesDatabase, ra_db::SyntaxDatabase, db::HirDatabase)] | 14 | #[salsa::database( |
15 | ra_db::FilesDatabaseStorage, | ||
16 | ra_db::SyntaxDatabaseStorage, | ||
17 | db::HirDatabaseStorage | ||
18 | )] | ||
15 | #[derive(Debug)] | 19 | #[derive(Debug)] |
16 | pub(crate) struct MockDatabase { | 20 | pub(crate) struct MockDatabase { |
17 | events: Mutex<Option<Vec<salsa::Event<MockDatabase>>>>, | 21 | events: Mutex<Option<Vec<salsa::Event<MockDatabase>>>>, |
diff --git a/crates/ra_ide_api/Cargo.toml b/crates/ra_ide_api/Cargo.toml index dfdddea50..79e473463 100644 --- a/crates/ra_ide_api/Cargo.toml +++ b/crates/ra_ide_api/Cargo.toml | |||
@@ -14,7 +14,6 @@ fst = "0.3.1" | |||
14 | rustc-hash = "1.0" | 14 | rustc-hash = "1.0" |
15 | parking_lot = "0.7.0" | 15 | parking_lot = "0.7.0" |
16 | unicase = "2.2.0" | 16 | unicase = "2.2.0" |
17 | salsa = "0.10.0-alpha3" | ||
18 | 17 | ||
19 | ra_syntax = { path = "../ra_syntax" } | 18 | ra_syntax = { path = "../ra_syntax" } |
20 | ra_ide_api_light = { path = "../ra_ide_api_light" } | 19 | ra_ide_api_light = { path = "../ra_ide_api_light" } |
diff --git a/crates/ra_ide_api/src/db.rs b/crates/ra_ide_api/src/db.rs index f0190ae51..30891aed4 100644 --- a/crates/ra_ide_api/src/db.rs +++ b/crates/ra_ide_api/src/db.rs | |||
@@ -8,11 +8,11 @@ use ra_db::{ | |||
8 | use crate::{symbol_index, LineIndex}; | 8 | use crate::{symbol_index, LineIndex}; |
9 | 9 | ||
10 | #[salsa::database( | 10 | #[salsa::database( |
11 | ra_db::FilesDatabase, | 11 | ra_db::FilesDatabaseStorage, |
12 | ra_db::SyntaxDatabase, | 12 | ra_db::SyntaxDatabaseStorage, |
13 | LineIndexDatabase, | 13 | LineIndexDatabaseStorage, |
14 | symbol_index::SymbolsDatabase, | 14 | symbol_index::SymbolsDatabaseStorage, |
15 | hir::db::HirDatabase | 15 | hir::db::HirDatabaseStorage |
16 | )] | 16 | )] |
17 | #[derive(Debug)] | 17 | #[derive(Debug)] |
18 | pub(crate) struct RootDatabase { | 18 | pub(crate) struct RootDatabase { |
@@ -62,7 +62,7 @@ impl AsRef<hir::HirInterner> for RootDatabase { | |||
62 | } | 62 | } |
63 | } | 63 | } |
64 | 64 | ||
65 | #[salsa::query_group] | 65 | #[salsa::query_group(LineIndexDatabaseStorage)] |
66 | pub(crate) trait LineIndexDatabase: ra_db::FilesDatabase + BaseDatabase { | 66 | pub(crate) trait LineIndexDatabase: ra_db::FilesDatabase + BaseDatabase { |
67 | fn line_index(&self, file_id: FileId) -> Arc<LineIndex>; | 67 | fn line_index(&self, file_id: FileId) -> Arc<LineIndex>; |
68 | } | 68 | } |
diff --git a/crates/ra_ide_api/src/imp.rs b/crates/ra_ide_api/src/imp.rs index 961f7b230..bd9e3f1e3 100644 --- a/crates/ra_ide_api/src/imp.rs +++ b/crates/ra_ide_api/src/imp.rs | |||
@@ -5,7 +5,7 @@ use hir::{ | |||
5 | }; | 5 | }; |
6 | use ra_db::{ | 6 | use ra_db::{ |
7 | FilesDatabase, SourceRoot, SourceRootId, SyntaxDatabase, | 7 | FilesDatabase, SourceRoot, SourceRootId, SyntaxDatabase, |
8 | salsa::Database, | 8 | salsa::{Database, SweepStrategy}, |
9 | }; | 9 | }; |
10 | use ra_ide_api_light::{self, assists, LocalEdit, Severity}; | 10 | use ra_ide_api_light::{self, assists, LocalEdit, Severity}; |
11 | use ra_syntax::{ | 11 | use ra_syntax::{ |
@@ -77,13 +77,13 @@ impl db::RootDatabase { | |||
77 | /// for some reason. Needs investigation. | 77 | /// for some reason. Needs investigation. |
78 | pub(crate) fn collect_garbage(&mut self) { | 78 | pub(crate) fn collect_garbage(&mut self) { |
79 | self.query(ra_db::SourceFileQuery) | 79 | self.query(ra_db::SourceFileQuery) |
80 | .sweep(salsa::SweepStrategy::default().discard_values()); | 80 | .sweep(SweepStrategy::default().discard_values()); |
81 | self.query(hir::db::HirSourceFileQuery) | 81 | self.query(hir::db::HirSourceFileQuery) |
82 | .sweep(salsa::SweepStrategy::default().discard_values()); | 82 | .sweep(SweepStrategy::default().discard_values()); |
83 | self.query(hir::db::FileItemsQuery) | 83 | self.query(hir::db::FileItemsQuery) |
84 | .sweep(salsa::SweepStrategy::default().discard_values()); | 84 | .sweep(SweepStrategy::default().discard_values()); |
85 | self.query(hir::db::FileItemQuery) | 85 | self.query(hir::db::FileItemQuery) |
86 | .sweep(salsa::SweepStrategy::default().discard_values()); | 86 | .sweep(SweepStrategy::default().discard_values()); |
87 | } | 87 | } |
88 | } | 88 | } |
89 | 89 | ||
diff --git a/crates/ra_ide_api/src/symbol_index.rs b/crates/ra_ide_api/src/symbol_index.rs index 6184ad3ec..e073a349e 100644 --- a/crates/ra_ide_api/src/symbol_index.rs +++ b/crates/ra_ide_api/src/symbol_index.rs | |||
@@ -44,7 +44,7 @@ use crate::{ | |||
44 | db::RootDatabase, | 44 | db::RootDatabase, |
45 | }; | 45 | }; |
46 | 46 | ||
47 | #[salsa::query_group] | 47 | #[salsa::query_group(SymbolsDatabaseStorage)] |
48 | pub(crate) trait SymbolsDatabase: hir::db::HirDatabase { | 48 | pub(crate) trait SymbolsDatabase: hir::db::HirDatabase { |
49 | fn file_symbols(&self, file_id: FileId) -> Arc<SymbolIndex>; | 49 | fn file_symbols(&self, file_id: FileId) -> Arc<SymbolIndex>; |
50 | #[salsa::input] | 50 | #[salsa::input] |