aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cargo.lock94
-rw-r--r--crates/ra_batch/Cargo.toml4
-rw-r--r--crates/ra_cli/Cargo.toml5
3 files changed, 51 insertions, 52 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 4f3538a51..33e6a4f3d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -55,7 +55,7 @@ dependencies = [
55 55
56[[package]] 56[[package]]
57name = "backtrace" 57name = "backtrace"
58version = "0.3.30" 58version = "0.3.31"
59source = "registry+https://github.com/rust-lang/crates.io-index" 59source = "registry+https://github.com/rust-lang/crates.io-index"
60dependencies = [ 60dependencies = [
61 "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", 61 "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -108,7 +108,7 @@ dependencies = [
108 "block-padding 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", 108 "block-padding 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
109 "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", 109 "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
110 "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", 110 "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
111 "generic-array 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", 111 "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
112] 112]
113 113
114[[package]] 114[[package]]
@@ -136,8 +136,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
136dependencies = [ 136dependencies = [
137 "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", 137 "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
138 "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", 138 "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
139 "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", 139 "serde 1.0.93 (registry+https://github.com/rust-lang/crates.io-index)",
140 "serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", 140 "serde_derive 1.0.93 (registry+https://github.com/rust-lang/crates.io-index)",
141 "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", 141 "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
142] 142]
143 143
@@ -208,12 +208,13 @@ dependencies = [
208 208
209[[package]] 209[[package]]
210name = "chrono" 210name = "chrono"
211version = "0.4.6" 211version = "0.4.7"
212source = "registry+https://github.com/rust-lang/crates.io-index" 212source = "registry+https://github.com/rust-lang/crates.io-index"
213dependencies = [ 213dependencies = [
214 "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
214 "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", 215 "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
215 "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", 216 "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
216 "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", 217 "serde 1.0.93 (registry+https://github.com/rust-lang/crates.io-index)",
217 "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", 218 "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
218] 219]
219 220
@@ -350,7 +351,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
350dependencies = [ 351dependencies = [
351 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", 352 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
352 "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", 353 "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
353 "syn 0.15.36 (registry+https://github.com/rust-lang/crates.io-index)", 354 "syn 0.15.38 (registry+https://github.com/rust-lang/crates.io-index)",
354] 355]
355 356
356[[package]] 357[[package]]
@@ -368,7 +369,7 @@ name = "digest"
368version = "0.8.0" 369version = "0.8.0"
369source = "registry+https://github.com/rust-lang/crates.io-index" 370source = "registry+https://github.com/rust-lang/crates.io-index"
370dependencies = [ 371dependencies = [
371 "generic-array 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", 372 "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
372] 373]
373 374
374[[package]] 375[[package]]
@@ -420,7 +421,7 @@ name = "error-chain"
420version = "0.12.1" 421version = "0.12.1"
421source = "registry+https://github.com/rust-lang/crates.io-index" 422source = "registry+https://github.com/rust-lang/crates.io-index"
422dependencies = [ 423dependencies = [
423 "backtrace 0.3.30 (registry+https://github.com/rust-lang/crates.io-index)", 424 "backtrace 0.3.31 (registry+https://github.com/rust-lang/crates.io-index)",
424 "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", 425 "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
425] 426]
426 427
@@ -429,7 +430,7 @@ name = "failure"
429version = "0.1.5" 430version = "0.1.5"
430source = "registry+https://github.com/rust-lang/crates.io-index" 431source = "registry+https://github.com/rust-lang/crates.io-index"
431dependencies = [ 432dependencies = [
432 "backtrace 0.3.30 (registry+https://github.com/rust-lang/crates.io-index)", 433 "backtrace 0.3.31 (registry+https://github.com/rust-lang/crates.io-index)",
433 "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", 434 "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
434] 435]
435 436
@@ -440,7 +441,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
440dependencies = [ 441dependencies = [
441 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", 442 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
442 "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", 443 "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
443 "syn 0.15.36 (registry+https://github.com/rust-lang/crates.io-index)", 444 "syn 0.15.38 (registry+https://github.com/rust-lang/crates.io-index)",
444 "synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", 445 "synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
445] 446]
446 447
@@ -469,7 +470,7 @@ name = "flexi_logger"
469version = "0.13.2" 470version = "0.13.2"
470source = "registry+https://github.com/rust-lang/crates.io-index" 471source = "registry+https://github.com/rust-lang/crates.io-index"
471dependencies = [ 472dependencies = [
472 "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", 473 "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
473 "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", 474 "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
474 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", 475 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
475 "regex 1.1.7 (registry+https://github.com/rust-lang/crates.io-index)", 476 "regex 1.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -533,13 +534,13 @@ dependencies = [
533 "flexi_logger 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)", 534 "flexi_logger 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)",
534 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", 535 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
535 "lsp-types 0.57.2 (registry+https://github.com/rust-lang/crates.io-index)", 536 "lsp-types 0.57.2 (registry+https://github.com/rust-lang/crates.io-index)",
536 "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", 537 "serde 1.0.93 (registry+https://github.com/rust-lang/crates.io-index)",
537 "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", 538 "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
538] 539]
539 540
540[[package]] 541[[package]]
541name = "generic-array" 542name = "generic-array"
542version = "0.12.0" 543version = "0.12.3"
543source = "registry+https://github.com/rust-lang/crates.io-index" 544source = "registry+https://github.com/rust-lang/crates.io-index"
544dependencies = [ 545dependencies = [
545 "typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", 546 "typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -618,7 +619,7 @@ name = "insta"
618version = "0.8.1" 619version = "0.8.1"
619source = "registry+https://github.com/rust-lang/crates.io-index" 620source = "registry+https://github.com/rust-lang/crates.io-index"
620dependencies = [ 621dependencies = [
621 "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", 622 "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
622 "ci_info 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", 623 "ci_info 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
623 "console 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)", 624 "console 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)",
624 "difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", 625 "difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -627,7 +628,7 @@ dependencies = [
627 "pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", 628 "pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
628 "pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", 629 "pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
629 "ron 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", 630 "ron 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
630 "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", 631 "serde 1.0.93 (registry+https://github.com/rust-lang/crates.io-index)",
631 "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", 632 "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
632 "serde_yaml 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)", 633 "serde_yaml 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)",
633 "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", 634 "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -759,8 +760,8 @@ dependencies = [
759 "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", 760 "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
760 "num-derive 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", 761 "num-derive 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
761 "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", 762 "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
762 "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", 763 "serde 1.0.93 (registry+https://github.com/rust-lang/crates.io-index)",
763 "serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", 764 "serde_derive 1.0.93 (registry+https://github.com/rust-lang/crates.io-index)",
764 "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", 765 "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
765 "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", 766 "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
766 "url_serde 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", 767 "url_serde 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -865,7 +866,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
865dependencies = [ 866dependencies = [
866 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", 867 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
867 "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", 868 "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
868 "syn 0.15.36 (registry+https://github.com/rust-lang/crates.io-index)", 869 "syn 0.15.38 (registry+https://github.com/rust-lang/crates.io-index)",
869] 870]
870 871
871[[package]] 872[[package]]
@@ -981,7 +982,7 @@ dependencies = [
981 "pest_meta 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", 982 "pest_meta 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
982 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", 983 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
983 "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", 984 "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
984 "syn 0.15.36 (registry+https://github.com/rust-lang/crates.io-index)", 985 "syn 0.15.38 (registry+https://github.com/rust-lang/crates.io-index)",
985] 986]
986 987
987[[package]] 988[[package]]
@@ -1069,7 +1070,6 @@ dependencies = [
1069 "ra_db 0.1.0", 1070 "ra_db 0.1.0",
1070 "ra_hir 0.1.0", 1071 "ra_hir 0.1.0",
1071 "ra_ide_api 0.1.0", 1072 "ra_ide_api 0.1.0",
1072 "ra_prof 0.1.0",
1073 "ra_project_model 0.1.0", 1073 "ra_project_model 0.1.0",
1074 "ra_syntax 0.1.0", 1074 "ra_syntax 0.1.0",
1075 "ra_vfs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", 1075 "ra_vfs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1188,7 +1188,7 @@ dependencies = [
1188 "ra_vfs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", 1188 "ra_vfs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
1189 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", 1189 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
1190 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", 1190 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
1191 "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", 1191 "serde 1.0.93 (registry+https://github.com/rust-lang/crates.io-index)",
1192 "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", 1192 "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
1193 "tempfile 3.0.8 (registry+https://github.com/rust-lang/crates.io-index)", 1193 "tempfile 3.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
1194 "test_utils 0.1.0", 1194 "test_utils 0.1.0",
@@ -1221,7 +1221,7 @@ dependencies = [
1221name = "ra_prof" 1221name = "ra_prof"
1222version = "0.1.0" 1222version = "0.1.0"
1223dependencies = [ 1223dependencies = [
1224 "backtrace 0.3.30 (registry+https://github.com/rust-lang/crates.io-index)", 1224 "backtrace 0.3.31 (registry+https://github.com/rust-lang/crates.io-index)",
1225 "cpuprofiler 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", 1225 "cpuprofiler 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
1226 "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", 1226 "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
1227 "once_cell 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", 1227 "once_cell 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1237,7 +1237,7 @@ dependencies = [
1237 "ra_db 0.1.0", 1237 "ra_db 0.1.0",
1238 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", 1238 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
1239 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", 1239 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
1240 "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", 1240 "serde 1.0.93 (registry+https://github.com/rust-lang/crates.io-index)",
1241 "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", 1241 "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
1242 "test_utils 0.1.0", 1242 "test_utils 0.1.0",
1243 "walkdir 2.2.8 (registry+https://github.com/rust-lang/crates.io-index)", 1243 "walkdir 2.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1479,7 +1479,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1479dependencies = [ 1479dependencies = [
1480 "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", 1480 "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
1481 "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", 1481 "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
1482 "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", 1482 "serde 1.0.93 (registry+https://github.com/rust-lang/crates.io-index)",
1483] 1483]
1484 1484
1485[[package]] 1485[[package]]
@@ -1543,7 +1543,7 @@ dependencies = [
1543 "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", 1543 "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
1544 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", 1544 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
1545 "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", 1545 "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
1546 "syn 0.15.36 (registry+https://github.com/rust-lang/crates.io-index)", 1546 "syn 0.15.38 (registry+https://github.com/rust-lang/crates.io-index)",
1547] 1547]
1548 1548
1549[[package]] 1549[[package]]
@@ -1570,7 +1570,7 @@ version = "0.9.0"
1570source = "registry+https://github.com/rust-lang/crates.io-index" 1570source = "registry+https://github.com/rust-lang/crates.io-index"
1571dependencies = [ 1571dependencies = [
1572 "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", 1572 "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
1573 "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", 1573 "serde 1.0.93 (registry+https://github.com/rust-lang/crates.io-index)",
1574] 1574]
1575 1575
1576[[package]] 1576[[package]]
@@ -1580,20 +1580,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1580 1580
1581[[package]] 1581[[package]]
1582name = "serde" 1582name = "serde"
1583version = "1.0.92" 1583version = "1.0.93"
1584source = "registry+https://github.com/rust-lang/crates.io-index" 1584source = "registry+https://github.com/rust-lang/crates.io-index"
1585dependencies = [ 1585dependencies = [
1586 "serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", 1586 "serde_derive 1.0.93 (registry+https://github.com/rust-lang/crates.io-index)",
1587] 1587]
1588 1588
1589[[package]] 1589[[package]]
1590name = "serde_derive" 1590name = "serde_derive"
1591version = "1.0.92" 1591version = "1.0.93"
1592source = "registry+https://github.com/rust-lang/crates.io-index" 1592source = "registry+https://github.com/rust-lang/crates.io-index"
1593dependencies = [ 1593dependencies = [
1594 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", 1594 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
1595 "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", 1595 "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
1596 "syn 0.15.36 (registry+https://github.com/rust-lang/crates.io-index)", 1596 "syn 0.15.38 (registry+https://github.com/rust-lang/crates.io-index)",
1597] 1597]
1598 1598
1599[[package]] 1599[[package]]
@@ -1603,7 +1603,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1603dependencies = [ 1603dependencies = [
1604 "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", 1604 "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
1605 "ryu 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", 1605 "ryu 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
1606 "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", 1606 "serde 1.0.93 (registry+https://github.com/rust-lang/crates.io-index)",
1607] 1607]
1608 1608
1609[[package]] 1609[[package]]
@@ -1613,7 +1613,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1613dependencies = [ 1613dependencies = [
1614 "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", 1614 "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
1615 "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", 1615 "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
1616 "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", 1616 "serde 1.0.93 (registry+https://github.com/rust-lang/crates.io-index)",
1617 "yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", 1617 "yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
1618] 1618]
1619 1619
@@ -1651,7 +1651,7 @@ name = "smol_str"
1651version = "0.1.11" 1651version = "0.1.11"
1652source = "registry+https://github.com/rust-lang/crates.io-index" 1652source = "registry+https://github.com/rust-lang/crates.io-index"
1653dependencies = [ 1653dependencies = [
1654 "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", 1654 "serde 1.0.93 (registry+https://github.com/rust-lang/crates.io-index)",
1655] 1655]
1656 1656
1657[[package]] 1657[[package]]
@@ -1677,7 +1677,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1677 1677
1678[[package]] 1678[[package]]
1679name = "syn" 1679name = "syn"
1680version = "0.15.36" 1680version = "0.15.38"
1681source = "registry+https://github.com/rust-lang/crates.io-index" 1681source = "registry+https://github.com/rust-lang/crates.io-index"
1682dependencies = [ 1682dependencies = [
1683 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", 1683 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1692,7 +1692,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1692dependencies = [ 1692dependencies = [
1693 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", 1693 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
1694 "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", 1694 "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
1695 "syn 0.15.36 (registry+https://github.com/rust-lang/crates.io-index)", 1695 "syn 0.15.38 (registry+https://github.com/rust-lang/crates.io-index)",
1696 "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", 1696 "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
1697] 1697]
1698 1698
@@ -1714,7 +1714,7 @@ name = "tera"
1714version = "0.11.20" 1714version = "0.11.20"
1715source = "registry+https://github.com/rust-lang/crates.io-index" 1715source = "registry+https://github.com/rust-lang/crates.io-index"
1716dependencies = [ 1716dependencies = [
1717 "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", 1717 "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
1718 "error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", 1718 "error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
1719 "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", 1719 "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
1720 "humansize 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", 1720 "humansize 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1722,7 +1722,7 @@ dependencies = [
1722 "pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", 1722 "pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
1723 "pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", 1723 "pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
1724 "regex 1.1.7 (registry+https://github.com/rust-lang/crates.io-index)", 1724 "regex 1.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
1725 "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", 1725 "serde 1.0.93 (registry+https://github.com/rust-lang/crates.io-index)",
1726 "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", 1726 "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
1727 "slug 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", 1727 "slug 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
1728 "unic-segment 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", 1728 "unic-segment 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1773,7 +1773,7 @@ name = "text_unit"
1773version = "0.1.9" 1773version = "0.1.9"
1774source = "registry+https://github.com/rust-lang/crates.io-index" 1774source = "registry+https://github.com/rust-lang/crates.io-index"
1775dependencies = [ 1775dependencies = [
1776 "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", 1776 "serde 1.0.93 (registry+https://github.com/rust-lang/crates.io-index)",
1777] 1777]
1778 1778
1779[[package]] 1779[[package]]
@@ -1931,7 +1931,7 @@ name = "url_serde"
1931version = "0.2.0" 1931version = "0.2.0"
1932source = "registry+https://github.com/rust-lang/crates.io-index" 1932source = "registry+https://github.com/rust-lang/crates.io-index"
1933dependencies = [ 1933dependencies = [
1934 "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", 1934 "serde 1.0.93 (registry+https://github.com/rust-lang/crates.io-index)",
1935 "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", 1935 "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
1936] 1936]
1937 1937
@@ -1946,7 +1946,7 @@ version = "0.7.4"
1946source = "registry+https://github.com/rust-lang/crates.io-index" 1946source = "registry+https://github.com/rust-lang/crates.io-index"
1947dependencies = [ 1947dependencies = [
1948 "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", 1948 "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
1949 "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", 1949 "serde 1.0.93 (registry+https://github.com/rust-lang/crates.io-index)",
1950] 1950]
1951 1951
1952[[package]] 1952[[package]]
@@ -2035,7 +2035,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
2035"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652" 2035"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652"
2036"checksum autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "0e49efa51329a5fd37e7c79db4621af617cd4e3e5bc224939808d076077077bf" 2036"checksum autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "0e49efa51329a5fd37e7c79db4621af617cd4e3e5bc224939808d076077077bf"
2037"checksum backtrace 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "346d7644f0b5f9bc73082d3b2236b69a05fd35cce0cfa3724e184e6a5c9e2a2f" 2037"checksum backtrace 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "346d7644f0b5f9bc73082d3b2236b69a05fd35cce0cfa3724e184e6a5c9e2a2f"
2038"checksum backtrace 0.3.30 (registry+https://github.com/rust-lang/crates.io-index)" = "ada4c783bb7e7443c14e0480f429ae2cc99da95065aeab7ee1b81ada0419404f" 2038"checksum backtrace 0.3.31 (registry+https://github.com/rust-lang/crates.io-index)" = "e0f77aa27f55a4beb477ff6bc4d9bf72f90eb422b19c1d8e5a644b8aeb674d66"
2039"checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6" 2039"checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6"
2040"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" 2040"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
2041"checksum bit-set 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e84c238982c4b1e1ee668d136c510c67a13465279c0cb367ea6baf6310620a80" 2041"checksum bit-set 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e84c238982c4b1e1ee668d136c510c67a13465279c0cb367ea6baf6310620a80"
@@ -2053,7 +2053,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
2053"checksum chalk-macros 0.1.1 (git+https://github.com/flodiebold/chalk.git?branch=fuel)" = "<none>" 2053"checksum chalk-macros 0.1.1 (git+https://github.com/flodiebold/chalk.git?branch=fuel)" = "<none>"
2054"checksum chalk-rust-ir 0.1.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)" = "<none>" 2054"checksum chalk-rust-ir 0.1.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)" = "<none>"
2055"checksum chalk-solve 0.1.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)" = "<none>" 2055"checksum chalk-solve 0.1.0 (git+https://github.com/flodiebold/chalk.git?branch=fuel)" = "<none>"
2056"checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878" 2056"checksum chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "77d81f58b7301084de3b958691458a53c3f7e0b1d702f77e550b6a88e3a88abe"
2057"checksum ci_info 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e5e881307a989a3a5e20d52a32cc05950e3c2178cccfcc9428271a6cde09f902" 2057"checksum ci_info 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e5e881307a989a3a5e20d52a32cc05950e3c2178cccfcc9428271a6cde09f902"
2058"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" 2058"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
2059"checksum clicolors-control 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "73abfd4c73d003a674ce5d2933fca6ce6c42480ea84a5ffe0a2dc39ed56300f9" 2059"checksum clicolors-control 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "73abfd4c73d003a674ce5d2933fca6ce6c42480ea84a5ffe0a2dc39ed56300f9"
@@ -2092,7 +2092,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
2092"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" 2092"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
2093"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" 2093"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
2094"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" 2094"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
2095"checksum generic-array 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3c0f28c2f5bfb5960175af447a2da7c18900693738343dc896ffbcabd9839592" 2095"checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
2096"checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" 2096"checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
2097"checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" 2097"checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
2098"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" 2098"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
@@ -2185,8 +2185,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
2185"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" 2185"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
2186"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" 2186"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
2187"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" 2187"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
2188"checksum serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)" = "32746bf0f26eab52f06af0d0aa1984f641341d06d8d673c693871da2d188c9be" 2188"checksum serde 1.0.93 (registry+https://github.com/rust-lang/crates.io-index)" = "960e29cf7004b3b6e65fc5002981400eb3ccc017a08a2406940823e58e7179a9"
2189"checksum serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)" = "46a3223d0c9ba936b61c0d2e3e559e3217dbfb8d65d06d26e8b3c25de38bae3e" 2189"checksum serde_derive 1.0.93 (registry+https://github.com/rust-lang/crates.io-index)" = "c4cce6663696bd38272e90bf34a0267e1226156c33f52d3f3915a2dd5d802085"
2190"checksum serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)" = "5a23aa71d4a4d43fdbfaac00eff68ba8a06a51759a89ac3304323e800c4dd40d" 2190"checksum serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)" = "5a23aa71d4a4d43fdbfaac00eff68ba8a06a51759a89ac3304323e800c4dd40d"
2191"checksum serde_yaml 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)" = "38b08a9a90e5260fe01c6480ec7c811606df6d3a660415808c3c3fa8ed95b582" 2191"checksum serde_yaml 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)" = "38b08a9a90e5260fe01c6480ec7c811606df6d3a660415808c3c3fa8ed95b582"
2192"checksum sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "23962131a91661d643c98940b20fcaffe62d776a823247be80a48fcb8b6fce68" 2192"checksum sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "23962131a91661d643c98940b20fcaffe62d776a823247be80a48fcb8b6fce68"
@@ -2197,7 +2197,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
2197"checksum stacker 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fb79482f57cf598af52094ec4cc3b3c42499d3ce5bd426f2ac41515b7e57404b" 2197"checksum stacker 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fb79482f57cf598af52094ec4cc3b3c42499d3ce5bd426f2ac41515b7e57404b"
2198"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" 2198"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
2199"checksum superslice 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ab16ced94dbd8a46c82fd81e3ed9a8727dac2977ea869d217bcc4ea1f122e81f" 2199"checksum superslice 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ab16ced94dbd8a46c82fd81e3ed9a8727dac2977ea869d217bcc4ea1f122e81f"
2200"checksum syn 0.15.36 (registry+https://github.com/rust-lang/crates.io-index)" = "8b4f551a91e2e3848aeef8751d0d4eec9489b6474c720fd4c55958d8d31a430c" 2200"checksum syn 0.15.38 (registry+https://github.com/rust-lang/crates.io-index)" = "37ea458a750f59ab679b47fef9b6722c586c5742f4cfe18a120bbc807e5e01fd"
2201"checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f" 2201"checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f"
2202"checksum tempfile 3.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7dc4738f2e68ed2855de5ac9cdbe05c9216773ecde4739b2f095002ab03a13ef" 2202"checksum tempfile 3.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7dc4738f2e68ed2855de5ac9cdbe05c9216773ecde4739b2f095002ab03a13ef"
2203"checksum tera 0.11.20 (registry+https://github.com/rust-lang/crates.io-index)" = "4b505279e19d8f7d24b1a9dc58327c9c36174b1a2c7ebdeac70792d017cb64f3" 2203"checksum tera 0.11.20 (registry+https://github.com/rust-lang/crates.io-index)" = "4b505279e19d8f7d24b1a9dc58327c9c36174b1a2c7ebdeac70792d017cb64f3"
diff --git a/crates/ra_batch/Cargo.toml b/crates/ra_batch/Cargo.toml
index f521937c5..7d8837fc3 100644
--- a/crates/ra_batch/Cargo.toml
+++ b/crates/ra_batch/Cargo.toml
@@ -15,9 +15,5 @@ ra_ide_api = { path = "../ra_ide_api" }
15ra_hir = { path = "../ra_hir" } 15ra_hir = { path = "../ra_hir" }
16ra_project_model = { path = "../ra_project_model" } 16ra_project_model = { path = "../ra_project_model" }
17 17
18[dependencies.ra_prof]
19path = "../ra_prof"
20# features = [ "cpuprofiler" ]
21
22[dev-dependencies] 18[dev-dependencies]
23test_utils = { path = "../test_utils" } 19test_utils = { path = "../test_utils" }
diff --git a/crates/ra_cli/Cargo.toml b/crates/ra_cli/Cargo.toml
index 301145b5d..b10873cd8 100644
--- a/crates/ra_cli/Cargo.toml
+++ b/crates/ra_cli/Cargo.toml
@@ -16,4 +16,7 @@ ra_ide_api = { path = "../ra_ide_api" }
16ra_batch = { path = "../ra_batch" } 16ra_batch = { path = "../ra_batch" }
17ra_hir = { path = "../ra_hir" } 17ra_hir = { path = "../ra_hir" }
18ra_db = { path = "../ra_db" } 18ra_db = { path = "../ra_db" }
19ra_prof = { path = "../ra_prof" } 19
20[dependencies.ra_prof]
21path = "../ra_prof"
22# features = [ "cpuprofiler" ]