aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cargo.lock262
-rw-r--r--crates/flycheck/src/lib.rs16
-rw-r--r--crates/project_model/src/workspace.rs5
-rw-r--r--crates/rust-analyzer/src/reload.rs2
-rw-r--r--crates/rust-analyzer/tests/rust-analyzer/support.rs2
5 files changed, 94 insertions, 193 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 2ca8194fd..ba0b8e083 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -30,7 +30,7 @@ version = "0.12.1"
30source = "registry+https://github.com/rust-lang/crates.io-index" 30source = "registry+https://github.com/rust-lang/crates.io-index"
31checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" 31checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
32dependencies = [ 32dependencies = [
33 "winapi 0.3.9", 33 "winapi",
34] 34]
35 35
36[[package]] 36[[package]]
@@ -75,7 +75,7 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
75dependencies = [ 75dependencies = [
76 "hermit-abi", 76 "hermit-abi",
77 "libc", 77 "libc",
78 "winapi 0.3.9", 78 "winapi",
79] 79]
80 80
81[[package]] 81[[package]]
@@ -91,7 +91,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
91checksum = "9d117600f438b1707d4e4ae15d3595657288f8235a0eb593e80ecc98ab34e1bc" 91checksum = "9d117600f438b1707d4e4ae15d3595657288f8235a0eb593e80ecc98ab34e1bc"
92dependencies = [ 92dependencies = [
93 "addr2line", 93 "addr2line",
94 "cfg-if 1.0.0", 94 "cfg-if",
95 "libc", 95 "libc",
96 "miniz_oxide", 96 "miniz_oxide",
97 "object", 97 "object",
@@ -172,12 +172,6 @@ dependencies = [
172 172
173[[package]] 173[[package]]
174name = "cfg-if" 174name = "cfg-if"
175version = "0.1.10"
176source = "registry+https://github.com/rust-lang/crates.io-index"
177checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
178
179[[package]]
180name = "cfg-if"
181version = "1.0.0" 175version = "1.0.0"
182source = "registry+https://github.com/rust-lang/crates.io-index" 176source = "registry+https://github.com/rust-lang/crates.io-index"
183checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" 177checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
@@ -245,7 +239,7 @@ dependencies = [
245 "num-integer", 239 "num-integer",
246 "num-traits", 240 "num-traits",
247 "time", 241 "time",
248 "winapi 0.3.9", 242 "winapi",
249] 243]
250 244
251[[package]] 245[[package]]
@@ -299,17 +293,7 @@ version = "1.2.1"
299source = "registry+https://github.com/rust-lang/crates.io-index" 293source = "registry+https://github.com/rust-lang/crates.io-index"
300checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" 294checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a"
301dependencies = [ 295dependencies = [
302 "cfg-if 1.0.0", 296 "cfg-if",
303]
304
305[[package]]
306name = "crossbeam-channel"
307version = "0.4.4"
308source = "registry+https://github.com/rust-lang/crates.io-index"
309checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87"
310dependencies = [
311 "crossbeam-utils 0.7.2",
312 "maybe-uninit",
313] 297]
314 298
315[[package]] 299[[package]]
@@ -318,8 +302,8 @@ version = "0.5.0"
318source = "registry+https://github.com/rust-lang/crates.io-index" 302source = "registry+https://github.com/rust-lang/crates.io-index"
319checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775" 303checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"
320dependencies = [ 304dependencies = [
321 "cfg-if 1.0.0", 305 "cfg-if",
322 "crossbeam-utils 0.8.1", 306 "crossbeam-utils",
323] 307]
324 308
325[[package]] 309[[package]]
@@ -328,9 +312,9 @@ version = "0.8.0"
328source = "registry+https://github.com/rust-lang/crates.io-index" 312source = "registry+https://github.com/rust-lang/crates.io-index"
329checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" 313checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
330dependencies = [ 314dependencies = [
331 "cfg-if 1.0.0", 315 "cfg-if",
332 "crossbeam-epoch", 316 "crossbeam-epoch",
333 "crossbeam-utils 0.8.1", 317 "crossbeam-utils",
334] 318]
335 319
336[[package]] 320[[package]]
@@ -339,9 +323,9 @@ version = "0.9.1"
339source = "registry+https://github.com/rust-lang/crates.io-index" 323source = "registry+https://github.com/rust-lang/crates.io-index"
340checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d" 324checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d"
341dependencies = [ 325dependencies = [
342 "cfg-if 1.0.0", 326 "cfg-if",
343 "const_fn", 327 "const_fn",
344 "crossbeam-utils 0.8.1", 328 "crossbeam-utils",
345 "lazy_static", 329 "lazy_static",
346 "memoffset", 330 "memoffset",
347 "scopeguard", 331 "scopeguard",
@@ -349,23 +333,12 @@ dependencies = [
349 333
350[[package]] 334[[package]]
351name = "crossbeam-utils" 335name = "crossbeam-utils"
352version = "0.7.2"
353source = "registry+https://github.com/rust-lang/crates.io-index"
354checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
355dependencies = [
356 "autocfg",
357 "cfg-if 0.1.10",
358 "lazy_static",
359]
360
361[[package]]
362name = "crossbeam-utils"
363version = "0.8.1" 336version = "0.8.1"
364source = "registry+https://github.com/rust-lang/crates.io-index" 337source = "registry+https://github.com/rust-lang/crates.io-index"
365checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d" 338checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d"
366dependencies = [ 339dependencies = [
367 "autocfg", 340 "autocfg",
368 "cfg-if 1.0.0", 341 "cfg-if",
369 "lazy_static", 342 "lazy_static",
370] 343]
371 344
@@ -375,7 +348,7 @@ version = "4.0.2"
375source = "registry+https://github.com/rust-lang/crates.io-index" 348source = "registry+https://github.com/rust-lang/crates.io-index"
376checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" 349checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c"
377dependencies = [ 350dependencies = [
378 "cfg-if 1.0.0", 351 "cfg-if",
379 "num_cpus", 352 "num_cpus",
380] 353]
381 354
@@ -431,10 +404,10 @@ version = "0.2.14"
431source = "registry+https://github.com/rust-lang/crates.io-index" 404source = "registry+https://github.com/rust-lang/crates.io-index"
432checksum = "1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8" 405checksum = "1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8"
433dependencies = [ 406dependencies = [
434 "cfg-if 1.0.0", 407 "cfg-if",
435 "libc", 408 "libc",
436 "redox_syscall 0.2.4", 409 "redox_syscall 0.2.4",
437 "winapi 0.3.9", 410 "winapi",
438] 411]
439 412
440[[package]] 413[[package]]
@@ -449,7 +422,7 @@ version = "1.0.19"
449source = "registry+https://github.com/rust-lang/crates.io-index" 422source = "registry+https://github.com/rust-lang/crates.io-index"
450checksum = "7411863d55df97a419aa64cb4d2f167103ea9d767e2c54a1868b7ac3f6b47129" 423checksum = "7411863d55df97a419aa64cb4d2f167103ea9d767e2c54a1868b7ac3f6b47129"
451dependencies = [ 424dependencies = [
452 "cfg-if 1.0.0", 425 "cfg-if",
453 "crc32fast", 426 "crc32fast",
454 "libc", 427 "libc",
455 "miniz_oxide", 428 "miniz_oxide",
@@ -460,7 +433,7 @@ name = "flycheck"
460version = "0.0.0" 433version = "0.0.0"
461dependencies = [ 434dependencies = [
462 "cargo_metadata", 435 "cargo_metadata",
463 "crossbeam-channel 0.5.0", 436 "crossbeam-channel",
464 "jod-thread", 437 "jod-thread",
465 "log", 438 "log",
466 "serde_json", 439 "serde_json",
@@ -510,22 +483,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
510checksum = "d79238883cf0307100b90aba4a755d8051a3182305dfe7f649a1e9dc0517006f" 483checksum = "d79238883cf0307100b90aba4a755d8051a3182305dfe7f649a1e9dc0517006f"
511 484
512[[package]] 485[[package]]
513name = "fuchsia-zircon"
514version = "0.3.3"
515source = "registry+https://github.com/rust-lang/crates.io-index"
516checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
517dependencies = [
518 "bitflags",
519 "fuchsia-zircon-sys",
520]
521
522[[package]]
523name = "fuchsia-zircon-sys"
524version = "0.3.3"
525source = "registry+https://github.com/rust-lang/crates.io-index"
526checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
527
528[[package]]
529name = "gimli" 486name = "gimli"
530version = "0.23.0" 487version = "0.23.0"
531source = "registry+https://github.com/rust-lang/crates.io-index" 488source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -653,7 +610,7 @@ version = "0.5.3"
653source = "registry+https://github.com/rust-lang/crates.io-index" 610source = "registry+https://github.com/rust-lang/crates.io-index"
654checksum = "2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654" 611checksum = "2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654"
655dependencies = [ 612dependencies = [
656 "winapi 0.3.9", 613 "winapi",
657] 614]
658 615
659[[package]] 616[[package]]
@@ -727,9 +684,9 @@ dependencies = [
727 684
728[[package]] 685[[package]]
729name = "inotify" 686name = "inotify"
730version = "0.8.3" 687version = "0.9.2"
731source = "registry+https://github.com/rust-lang/crates.io-index" 688source = "registry+https://github.com/rust-lang/crates.io-index"
732checksum = "46dd0a94b393c730779ccfd2a872b67b1eb67be3fc33082e733bdb38b5fde4d4" 689checksum = "d19f57db1baad9d09e43a3cd76dcf82ebdafd37d75c9498b87762dba77c93f15"
733dependencies = [ 690dependencies = [
734 "bitflags", 691 "bitflags",
735 "inotify-sys", 692 "inotify-sys",
@@ -751,16 +708,7 @@ version = "0.1.9"
751source = "registry+https://github.com/rust-lang/crates.io-index" 708source = "registry+https://github.com/rust-lang/crates.io-index"
752checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" 709checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
753dependencies = [ 710dependencies = [
754 "cfg-if 1.0.0", 711 "cfg-if",
755]
756
757[[package]]
758name = "iovec"
759version = "0.1.4"
760source = "registry+https://github.com/rust-lang/crates.io-index"
761checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
762dependencies = [
763 "libc",
764] 712]
765 713
766[[package]] 714[[package]]
@@ -826,16 +774,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
826checksum = "8b23360e99b8717f20aaa4598f5a6541efbe30630039fbc7706cf954a87947ae" 774checksum = "8b23360e99b8717f20aaa4598f5a6541efbe30630039fbc7706cf954a87947ae"
827 775
828[[package]] 776[[package]]
829name = "kernel32-sys"
830version = "0.2.2"
831source = "registry+https://github.com/rust-lang/crates.io-index"
832checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
833dependencies = [
834 "winapi 0.2.8",
835 "winapi-build",
836]
837
838[[package]]
839name = "la-arena" 777name = "la-arena"
840version = "0.2.0" 778version = "0.2.0"
841 779
@@ -846,16 +784,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
846checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" 784checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
847 785
848[[package]] 786[[package]]
849name = "lazycell"
850version = "1.3.0"
851source = "registry+https://github.com/rust-lang/crates.io-index"
852checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
853
854[[package]]
855name = "libc" 787name = "libc"
856version = "0.2.82" 788version = "0.2.83"
857source = "registry+https://github.com/rust-lang/crates.io-index" 789source = "registry+https://github.com/rust-lang/crates.io-index"
858checksum = "89203f3fba0a3795506acaad8ebce3c80c0af93f994d5a1d7a0b1eeb23271929" 790checksum = "7eb0c4e9c72ee9d69b767adebc5f4788462a3b45624acd919475c92597bcaf4f"
859 791
860[[package]] 792[[package]]
861name = "libloading" 793name = "libloading"
@@ -863,8 +795,8 @@ version = "0.6.7"
863source = "registry+https://github.com/rust-lang/crates.io-index" 795source = "registry+https://github.com/rust-lang/crates.io-index"
864checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883" 796checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883"
865dependencies = [ 797dependencies = [
866 "cfg-if 1.0.0", 798 "cfg-if",
867 "winapi 0.3.9", 799 "winapi",
868] 800]
869 801
870[[package]] 802[[package]]
@@ -891,7 +823,7 @@ version = "0.4.14"
891source = "registry+https://github.com/rust-lang/crates.io-index" 823source = "registry+https://github.com/rust-lang/crates.io-index"
892checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" 824checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
893dependencies = [ 825dependencies = [
894 "cfg-if 1.0.0", 826 "cfg-if",
895] 827]
896 828
897[[package]] 829[[package]]
@@ -900,7 +832,7 @@ version = "0.5.0"
900source = "registry+https://github.com/rust-lang/crates.io-index" 832source = "registry+https://github.com/rust-lang/crates.io-index"
901checksum = "69b18dfe0e4a380b872aa79d8e0ee6c3d7a9682466e84b83ad807c88b3545f79" 833checksum = "69b18dfe0e4a380b872aa79d8e0ee6c3d7a9682466e84b83ad807c88b3545f79"
902dependencies = [ 834dependencies = [
903 "crossbeam-channel 0.5.0", 835 "crossbeam-channel",
904 "log", 836 "log",
905 "serde", 837 "serde",
906 "serde_json", 838 "serde_json",
@@ -936,12 +868,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
936checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" 868checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
937 869
938[[package]] 870[[package]]
939name = "maybe-uninit"
940version = "2.0.0"
941source = "registry+https://github.com/rust-lang/crates.io-index"
942checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
943
944[[package]]
945name = "mbe" 871name = "mbe"
946version = "0.0.0" 872version = "0.0.0"
947dependencies = [ 873dependencies = [
@@ -967,7 +893,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
967checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b" 893checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
968dependencies = [ 894dependencies = [
969 "libc", 895 "libc",
970 "winapi 0.3.9", 896 "winapi",
971] 897]
972 898
973[[package]] 899[[package]]
@@ -1000,76 +926,53 @@ dependencies = [
1000 926
1001[[package]] 927[[package]]
1002name = "mio" 928name = "mio"
1003version = "0.6.23" 929version = "0.7.7"
1004source = "registry+https://github.com/rust-lang/crates.io-index" 930source = "registry+https://github.com/rust-lang/crates.io-index"
1005checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" 931checksum = "e50ae3f04d169fcc9bde0b547d1c205219b7157e07ded9c5aff03e0637cb3ed7"
1006dependencies = [ 932dependencies = [
1007 "cfg-if 0.1.10",
1008 "fuchsia-zircon",
1009 "fuchsia-zircon-sys",
1010 "iovec",
1011 "kernel32-sys",
1012 "libc", 933 "libc",
1013 "log", 934 "log",
1014 "miow", 935 "miow",
1015 "net2", 936 "ntapi",
1016 "slab", 937 "winapi",
1017 "winapi 0.2.8",
1018]
1019
1020[[package]]
1021name = "mio-extras"
1022version = "2.0.6"
1023source = "registry+https://github.com/rust-lang/crates.io-index"
1024checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19"
1025dependencies = [
1026 "lazycell",
1027 "log",
1028 "mio",
1029 "slab",
1030] 938]
1031 939
1032[[package]] 940[[package]]
1033name = "miow" 941name = "miow"
1034version = "0.2.2" 942version = "0.3.6"
1035source = "registry+https://github.com/rust-lang/crates.io-index" 943source = "registry+https://github.com/rust-lang/crates.io-index"
1036checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" 944checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897"
1037dependencies = [ 945dependencies = [
1038 "kernel32-sys", 946 "socket2",
1039 "net2", 947 "winapi",
1040 "winapi 0.2.8",
1041 "ws2_32-sys",
1042]
1043
1044[[package]]
1045name = "net2"
1046version = "0.2.37"
1047source = "registry+https://github.com/rust-lang/crates.io-index"
1048checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae"
1049dependencies = [
1050 "cfg-if 0.1.10",
1051 "libc",
1052 "winapi 0.3.9",
1053] 948]
1054 949
1055[[package]] 950[[package]]
1056name = "notify" 951name = "notify"
1057version = "5.0.0-pre.4" 952version = "5.0.0-pre.5"
1058source = "registry+https://github.com/rust-lang/crates.io-index" 953source = "registry+https://github.com/rust-lang/crates.io-index"
1059checksum = "a8b946889dfdad884379cd56367d93b6d0ce8889cc027d26a69a3a31c0a03bb5" 954checksum = "58e54552360d7b89a698eca6de3927205a8e03e8080dc13d779de5c7876e098b"
1060dependencies = [ 955dependencies = [
1061 "anymap", 956 "anymap",
1062 "bitflags", 957 "bitflags",
1063 "crossbeam-channel 0.4.4", 958 "crossbeam-channel",
1064 "filetime", 959 "filetime",
1065 "fsevent", 960 "fsevent",
1066 "fsevent-sys", 961 "fsevent-sys",
1067 "inotify", 962 "inotify",
1068 "libc", 963 "libc",
1069 "mio", 964 "mio",
1070 "mio-extras",
1071 "walkdir", 965 "walkdir",
1072 "winapi 0.3.9", 966 "winapi",
967]
968
969[[package]]
970name = "ntapi"
971version = "0.3.6"
972source = "registry+https://github.com/rust-lang/crates.io-index"
973checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
974dependencies = [
975 "winapi",
1073] 976]
1074 977
1075[[package]] 978[[package]]
@@ -1136,12 +1039,12 @@ version = "0.8.2"
1136source = "registry+https://github.com/rust-lang/crates.io-index" 1039source = "registry+https://github.com/rust-lang/crates.io-index"
1137checksum = "9ccb628cad4f84851442432c60ad8e1f607e29752d0bf072cbd0baf28aa34272" 1040checksum = "9ccb628cad4f84851442432c60ad8e1f607e29752d0bf072cbd0baf28aa34272"
1138dependencies = [ 1041dependencies = [
1139 "cfg-if 1.0.0", 1042 "cfg-if",
1140 "instant", 1043 "instant",
1141 "libc", 1044 "libc",
1142 "redox_syscall 0.1.57", 1045 "redox_syscall 0.1.57",
1143 "smallvec", 1046 "smallvec",
1144 "winapi 0.3.9", 1047 "winapi",
1145] 1048]
1146 1049
1147[[package]] 1050[[package]]
@@ -1250,7 +1153,7 @@ name = "proc_macro_api"
1250version = "0.0.0" 1153version = "0.0.0"
1251dependencies = [ 1154dependencies = [
1252 "base_db", 1155 "base_db",
1253 "crossbeam-channel 0.5.0", 1156 "crossbeam-channel",
1254 "jod-thread", 1157 "jod-thread",
1255 "log", 1158 "log",
1256 "serde", 1159 "serde",
@@ -1283,7 +1186,7 @@ version = "0.0.0"
1283name = "profile" 1186name = "profile"
1284version = "0.0.0" 1187version = "0.0.0"
1285dependencies = [ 1188dependencies = [
1286 "cfg-if 1.0.0", 1189 "cfg-if",
1287 "countme", 1190 "countme",
1288 "jemalloc-ctl", 1191 "jemalloc-ctl",
1289 "la-arena", 1192 "la-arena",
@@ -1360,9 +1263,9 @@ version = "1.9.0"
1360source = "registry+https://github.com/rust-lang/crates.io-index" 1263source = "registry+https://github.com/rust-lang/crates.io-index"
1361checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" 1264checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
1362dependencies = [ 1265dependencies = [
1363 "crossbeam-channel 0.5.0", 1266 "crossbeam-channel",
1364 "crossbeam-deque", 1267 "crossbeam-deque",
1365 "crossbeam-utils 0.8.1", 1268 "crossbeam-utils",
1366 "lazy_static", 1269 "lazy_static",
1367 "num_cpus", 1270 "num_cpus",
1368] 1271]
@@ -1427,7 +1330,7 @@ dependencies = [
1427 "always-assert", 1330 "always-assert",
1428 "anyhow", 1331 "anyhow",
1429 "cfg", 1332 "cfg",
1430 "crossbeam-channel 0.5.0", 1333 "crossbeam-channel",
1431 "dissimilar", 1334 "dissimilar",
1432 "env_logger", 1335 "env_logger",
1433 "expect-test", 1336 "expect-test",
@@ -1469,7 +1372,7 @@ dependencies = [
1469 "tt", 1372 "tt",
1470 "vfs", 1373 "vfs",
1471 "vfs-notify", 1374 "vfs-notify",
1472 "winapi 0.3.9", 1375 "winapi",
1473] 1376]
1474 1377
1475[[package]] 1378[[package]]
@@ -1505,7 +1408,7 @@ version = "0.16.0"
1505source = "registry+https://github.com/rust-lang/crates.io-index" 1408source = "registry+https://github.com/rust-lang/crates.io-index"
1506checksum = "d8fadca2ab5de17acf66d744f4888049ca8f1bb9b8a1ab8afd9d032cc959c5dc" 1409checksum = "d8fadca2ab5de17acf66d744f4888049ca8f1bb9b8a1ab8afd9d032cc959c5dc"
1507dependencies = [ 1410dependencies = [
1508 "crossbeam-utils 0.8.1", 1411 "crossbeam-utils",
1509 "indexmap", 1412 "indexmap",
1510 "lock_api", 1413 "lock_api",
1511 "log", 1414 "log",
@@ -1630,12 +1533,6 @@ dependencies = [
1630] 1533]
1631 1534
1632[[package]] 1535[[package]]
1633name = "slab"
1634version = "0.4.2"
1635source = "registry+https://github.com/rust-lang/crates.io-index"
1636checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
1637
1638[[package]]
1639name = "smallvec" 1536name = "smallvec"
1640version = "1.6.1" 1537version = "1.6.1"
1641source = "registry+https://github.com/rust-lang/crates.io-index" 1538source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1651,6 +1548,17 @@ dependencies = [
1651] 1548]
1652 1549
1653[[package]] 1550[[package]]
1551name = "socket2"
1552version = "0.3.19"
1553source = "registry+https://github.com/rust-lang/crates.io-index"
1554checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
1555dependencies = [
1556 "cfg-if",
1557 "libc",
1558 "winapi",
1559]
1560
1561[[package]]
1654name = "ssr" 1562name = "ssr"
1655version = "0.0.0" 1563version = "0.0.0"
1656dependencies = [ 1564dependencies = [
@@ -1777,7 +1685,7 @@ checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
1777dependencies = [ 1685dependencies = [
1778 "libc", 1686 "libc",
1779 "wasi", 1687 "wasi",
1780 "winapi 0.3.9", 1688 "winapi",
1781] 1689]
1782 1690
1783[[package]] 1691[[package]]
@@ -1808,7 +1716,7 @@ version = "0.1.22"
1808source = "registry+https://github.com/rust-lang/crates.io-index" 1716source = "registry+https://github.com/rust-lang/crates.io-index"
1809checksum = "9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3" 1717checksum = "9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3"
1810dependencies = [ 1718dependencies = [
1811 "cfg-if 1.0.0", 1719 "cfg-if",
1812 "pin-project-lite", 1720 "pin-project-lite",
1813 "tracing-attributes", 1721 "tracing-attributes",
1814 "tracing-core", 1722 "tracing-core",
@@ -1983,7 +1891,7 @@ dependencies = [
1983name = "vfs-notify" 1891name = "vfs-notify"
1984version = "0.0.0" 1892version = "0.0.0"
1985dependencies = [ 1893dependencies = [
1986 "crossbeam-channel 0.5.0", 1894 "crossbeam-channel",
1987 "jod-thread", 1895 "jod-thread",
1988 "log", 1896 "log",
1989 "notify", 1897 "notify",
@@ -2000,7 +1908,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
2000checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" 1908checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
2001dependencies = [ 1909dependencies = [
2002 "same-file", 1910 "same-file",
2003 "winapi 0.3.9", 1911 "winapi",
2004 "winapi-util", 1912 "winapi-util",
2005] 1913]
2006 1914
@@ -2012,12 +1920,6 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
2012 1920
2013[[package]] 1921[[package]]
2014name = "winapi" 1922name = "winapi"
2015version = "0.2.8"
2016source = "registry+https://github.com/rust-lang/crates.io-index"
2017checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
2018
2019[[package]]
2020name = "winapi"
2021version = "0.3.9" 1923version = "0.3.9"
2022source = "registry+https://github.com/rust-lang/crates.io-index" 1924source = "registry+https://github.com/rust-lang/crates.io-index"
2023checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" 1925checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
@@ -2027,12 +1929,6 @@ dependencies = [
2027] 1929]
2028 1930
2029[[package]] 1931[[package]]
2030name = "winapi-build"
2031version = "0.1.1"
2032source = "registry+https://github.com/rust-lang/crates.io-index"
2033checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
2034
2035[[package]]
2036name = "winapi-i686-pc-windows-gnu" 1932name = "winapi-i686-pc-windows-gnu"
2037version = "0.4.0" 1933version = "0.4.0"
2038source = "registry+https://github.com/rust-lang/crates.io-index" 1934source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2044,7 +1940,7 @@ version = "0.1.5"
2044source = "registry+https://github.com/rust-lang/crates.io-index" 1940source = "registry+https://github.com/rust-lang/crates.io-index"
2045checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" 1941checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
2046dependencies = [ 1942dependencies = [
2047 "winapi 0.3.9", 1943 "winapi",
2048] 1944]
2049 1945
2050[[package]] 1946[[package]]
@@ -2060,16 +1956,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
2060checksum = "06069a848f95fceae3e5e03c0ddc8cb78452b56654ee0c8e68f938cf790fb9e3" 1956checksum = "06069a848f95fceae3e5e03c0ddc8cb78452b56654ee0c8e68f938cf790fb9e3"
2061 1957
2062[[package]] 1958[[package]]
2063name = "ws2_32-sys"
2064version = "0.2.1"
2065source = "registry+https://github.com/rust-lang/crates.io-index"
2066checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
2067dependencies = [
2068 "winapi 0.2.8",
2069 "winapi-build",
2070]
2071
2072[[package]]
2073name = "xshell" 1959name = "xshell"
2074version = "0.1.8" 1960version = "0.1.8"
2075source = "registry+https://github.com/rust-lang/crates.io-index" 1961source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/crates/flycheck/src/lib.rs b/crates/flycheck/src/lib.rs
index 4388e8c67..e04208006 100644
--- a/crates/flycheck/src/lib.rs
+++ b/crates/flycheck/src/lib.rs
@@ -76,7 +76,6 @@ impl FlycheckHandle {
76 } 76 }
77} 77}
78 78
79#[derive(Debug)]
80pub enum Message { 79pub enum Message {
81 /// Request adding a diagnostic with fixes included to a file 80 /// Request adding a diagnostic with fixes included to a file
82 AddDiagnostic { workspace_root: PathBuf, diagnostic: Diagnostic }, 81 AddDiagnostic { workspace_root: PathBuf, diagnostic: Diagnostic },
@@ -89,6 +88,21 @@ pub enum Message {
89 }, 88 },
90} 89}
91 90
91impl fmt::Debug for Message {
92 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
93 match self {
94 Message::AddDiagnostic { workspace_root, diagnostic } => f
95 .debug_struct("AddDiagnostic")
96 .field("workspace_root", workspace_root)
97 .field("diagnostic_code", &diagnostic.code.as_ref().map(|it| &it.code))
98 .finish(),
99 Message::Progress { id, progress } => {
100 f.debug_struct("Progress").field("id", id).field("progress", progress).finish()
101 }
102 }
103 }
104}
105
92#[derive(Debug)] 106#[derive(Debug)]
93pub enum Progress { 107pub enum Progress {
94 DidStart, 108 DidStart,
diff --git a/crates/project_model/src/workspace.rs b/crates/project_model/src/workspace.rs
index bc5041e5a..559f4e7bf 100644
--- a/crates/project_model/src/workspace.rs
+++ b/crates/project_model/src/workspace.rs
@@ -51,6 +51,7 @@ pub enum ProjectWorkspace {
51 51
52impl fmt::Debug for ProjectWorkspace { 52impl fmt::Debug for ProjectWorkspace {
53 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { 53 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
54 // Make sure this isn't too verbose.
54 match self { 55 match self {
55 ProjectWorkspace::Cargo { cargo, sysroot, rustc, rustc_cfg } => f 56 ProjectWorkspace::Cargo { cargo, sysroot, rustc, rustc_cfg } => f
56 .debug_struct("Cargo") 57 .debug_struct("Cargo")
@@ -60,7 +61,7 @@ impl fmt::Debug for ProjectWorkspace {
60 "n_rustc_compiler_crates", 61 "n_rustc_compiler_crates",
61 &rustc.as_ref().map_or(0, |rc| rc.packages().len()), 62 &rustc.as_ref().map_or(0, |rc| rc.packages().len()),
62 ) 63 )
63 .field("rustc_cfg", rustc_cfg) 64 .field("n_rustc_cfg", &rustc_cfg.len())
64 .finish(), 65 .finish(),
65 ProjectWorkspace::Json { project, sysroot, rustc_cfg } => { 66 ProjectWorkspace::Json { project, sysroot, rustc_cfg } => {
66 let mut debug_struct = f.debug_struct("Json"); 67 let mut debug_struct = f.debug_struct("Json");
@@ -68,7 +69,7 @@ impl fmt::Debug for ProjectWorkspace {
68 if let Some(sysroot) = sysroot { 69 if let Some(sysroot) = sysroot {
69 debug_struct.field("n_sysroot_crates", &sysroot.crates().len()); 70 debug_struct.field("n_sysroot_crates", &sysroot.crates().len());
70 } 71 }
71 debug_struct.field("rustc_cfg", rustc_cfg); 72 debug_struct.field("n_rustc_cfg", &rustc_cfg.len());
72 debug_struct.finish() 73 debug_struct.finish()
73 } 74 }
74 } 75 }
diff --git a/crates/rust-analyzer/src/reload.rs b/crates/rust-analyzer/src/reload.rs
index 0507186dc..ef73099cf 100644
--- a/crates/rust-analyzer/src/reload.rs
+++ b/crates/rust-analyzer/src/reload.rs
@@ -103,10 +103,10 @@ impl GlobalState {
103 self.fetch_workspaces_queue.request_op() 103 self.fetch_workspaces_queue.request_op()
104 } 104 }
105 pub(crate) fn fetch_workspaces_if_needed(&mut self) { 105 pub(crate) fn fetch_workspaces_if_needed(&mut self) {
106 log::info!("will fetch workspaces");
107 if !self.fetch_workspaces_queue.should_start_op() { 106 if !self.fetch_workspaces_queue.should_start_op() {
108 return; 107 return;
109 } 108 }
109 log::info!("will fetch workspaces");
110 110
111 self.task_pool.handle.spawn_with_sender({ 111 self.task_pool.handle.spawn_with_sender({
112 let linked_projects = self.config.linked_projects(); 112 let linked_projects = self.config.linked_projects();
diff --git a/crates/rust-analyzer/tests/rust-analyzer/support.rs b/crates/rust-analyzer/tests/rust-analyzer/support.rs
index f59958e8d..4c4b994fe 100644
--- a/crates/rust-analyzer/tests/rust-analyzer/support.rs
+++ b/crates/rust-analyzer/tests/rust-analyzer/support.rs
@@ -64,7 +64,7 @@ impl<'a> Project<'a> {
64 let tmp_dir = self.tmp_dir.unwrap_or_else(|| TestDir::new()); 64 let tmp_dir = self.tmp_dir.unwrap_or_else(|| TestDir::new());
65 static INIT: Once = Once::new(); 65 static INIT: Once = Once::new();
66 INIT.call_once(|| { 66 INIT.call_once(|| {
67 env_logger::builder().is_test(true).try_init().unwrap(); 67 env_logger::builder().is_test(true).parse_env("RA_LOG").try_init().unwrap();
68 profile::init_from(crate::PROFILE); 68 profile::init_from(crate::PROFILE);
69 }); 69 });
70 70