aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2020-01-07 16:17:31 +0000
committerGitHub <[email protected]>2020-01-07 16:17:31 +0000
commitb8ca479a2e224ce415f086eb4841259c0e48f7c3 (patch)
tree7747ebb61848350672034b91f78d574543049184
parent9df1663c12f48df7f4921e68c928016877390565 (diff)
parent072f0d323b4946a7f722b2dbdb82ece85914efa3 (diff)
Merge pull request #2756 from matklad/retasks
:arrow_up: crates
-rw-r--r--.github/workflows/ci.yaml25
-rw-r--r--Cargo.lock43
-rw-r--r--crates/ra_lsp_server/src/caps.rs1
-rw-r--r--xtask/src/lib.rs40
-rw-r--r--xtask/src/main.rs6
5 files changed, 71 insertions, 44 deletions
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index abdec602e..84c04ee72 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -56,28 +56,13 @@ jobs:
56 with: 56 with:
57 command: test 57 command: test
58 58
59 - name: Prepare build directory for cache (UNIX) 59 - name: Prepare cache
60 if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest' 60 run: cargo xtask pre-cache
61 run: |
62 find ./target/debug -maxdepth 1 -type f -delete \
63 && rm -fr ./target/debug/{deps,.fingerprint}/{*ra_*,*heavy_test*,*gen_lsp*,*thread_worker*} \
64 && rm -f ./target/.rustc_info.json \
65 && rm ./target/.slow_tests_cookie
66 61
67 - name: Prepare build directory for cache (Windows) 62 - name: Prepare cache 2
68 if: matrix.os == 'windows-latest' 63 if: matrix.os == 'windows-latest'
69 run: >- 64 run: Remove-Item ./target/debug/xtask.exe
70 (Get-ChildItem ./target/debug -Recurse -Depth 1 -File | Remove-Item) -and 65
71 (Remove-Item -Force -Recurse ./target/debug/deps/*ra_*) -and
72 (Remove-Item -Force -Recurse ./target/debug/deps/*heavy_test*) -and
73 (Remove-Item -Force -Recurse ./target/debug/deps/*gen_lsp*) -and
74 (Remove-Item -Force -Recurse ./target/debug/deps/*thread_worker*) -and
75 (Remove-Item -Force -Recurse ./target/debug/.fingerprint/*ra_*) -and
76 (Remove-Item -Force -Recurse ./target/debug/.fingerprint/*heavy_test*) -and
77 (Remove-Item -Force -Recurse ./target/debug/.fingerprint/*gen_lsp*) -and
78 (Remove-Item -Force -Recurse ./target/debug/.fingerprint/*thread_worker*) -and
79 (Remove-Item -Force ./target/.rustc_info.json) -and
80 (Remove-Item ./target/.slow_tests_cookie)
81 66
82 type-script: 67 type-script:
83 name: TypeScript 68 name: TypeScript
diff --git a/Cargo.lock b/Cargo.lock
index 79f28f7cd..312240bd2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -54,7 +54,7 @@ name = "backtrace-sys"
54version = "0.1.32" 54version = "0.1.32"
55source = "registry+https://github.com/rust-lang/crates.io-index" 55source = "registry+https://github.com/rust-lang/crates.io-index"
56dependencies = [ 56dependencies = [
57 "cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)", 57 "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)",
58 "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", 58 "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
59] 59]
60 60
@@ -115,7 +115,7 @@ dependencies = [
115 115
116[[package]] 116[[package]]
117name = "cc" 117name = "cc"
118version = "1.0.48" 118version = "1.0.49"
119source = "registry+https://github.com/rust-lang/crates.io-index" 119source = "registry+https://github.com/rust-lang/crates.io-index"
120 120
121[[package]] 121[[package]]
@@ -402,12 +402,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
402 402
403[[package]] 403[[package]]
404name = "getrandom" 404name = "getrandom"
405version = "0.1.13" 405version = "0.1.14"
406source = "registry+https://github.com/rust-lang/crates.io-index" 406source = "registry+https://github.com/rust-lang/crates.io-index"
407dependencies = [ 407dependencies = [
408 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", 408 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
409 "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", 409 "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
410 "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", 410 "wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)",
411] 411]
412 412
413[[package]] 413[[package]]
@@ -466,7 +466,7 @@ dependencies = [
466 466
467[[package]] 467[[package]]
468name = "inotify" 468name = "inotify"
469version = "0.6.1" 469version = "0.7.0"
470source = "registry+https://github.com/rust-lang/crates.io-index" 470source = "registry+https://github.com/rust-lang/crates.io-index"
471dependencies = [ 471dependencies = [
472 "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", 472 "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -532,7 +532,7 @@ name = "jemalloc-sys"
532version = "0.3.2" 532version = "0.3.2"
533source = "registry+https://github.com/rust-lang/crates.io-index" 533source = "registry+https://github.com/rust-lang/crates.io-index"
534dependencies = [ 534dependencies = [
535 "cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)", 535 "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)",
536 "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", 536 "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
537 "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", 537 "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
538] 538]
@@ -619,7 +619,7 @@ dependencies = [
619 619
620[[package]] 620[[package]]
621name = "lsp-types" 621name = "lsp-types"
622version = "0.68.0" 622version = "0.68.1"
623source = "registry+https://github.com/rust-lang/crates.io-index" 623source = "registry+https://github.com/rust-lang/crates.io-index"
624dependencies = [ 624dependencies = [
625 "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", 625 "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -700,15 +700,14 @@ dependencies = [
700 700
701[[package]] 701[[package]]
702name = "notify" 702name = "notify"
703version = "4.0.14" 703version = "4.0.15"
704source = "registry+https://github.com/rust-lang/crates.io-index" 704source = "registry+https://github.com/rust-lang/crates.io-index"
705dependencies = [ 705dependencies = [
706 "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", 706 "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
707 "filetime 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", 707 "filetime 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
708 "fsevent 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", 708 "fsevent 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
709 "fsevent-sys 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", 709 "fsevent-sys 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
710 "inotify 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", 710 "inotify 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
711 "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
712 "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", 711 "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
713 "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", 712 "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
714 "mio-extras 2.0.6 (registry+https://github.com/rust-lang/crates.io-index)", 713 "mio-extras 2.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -900,7 +899,7 @@ dependencies = [
900 "insta 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", 899 "insta 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
901 "jod-thread 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", 900 "jod-thread 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
902 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", 901 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
903 "lsp-types 0.68.0 (registry+https://github.com/rust-lang/crates.io-index)", 902 "lsp-types 0.68.1 (registry+https://github.com/rust-lang/crates.io-index)",
904 "parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", 903 "parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
905 "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", 904 "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
906] 905]
@@ -1064,7 +1063,7 @@ dependencies = [
1064 "jod-thread 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", 1063 "jod-thread 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
1065 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", 1064 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
1066 "lsp-server 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", 1065 "lsp-server 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
1067 "lsp-types 0.68.0 (registry+https://github.com/rust-lang/crates.io-index)", 1066 "lsp-types 0.68.1 (registry+https://github.com/rust-lang/crates.io-index)",
1068 "parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", 1067 "parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
1069 "ra_cargo_watch 0.1.0", 1068 "ra_cargo_watch 0.1.0",
1070 "ra_ide 0.1.0", 1069 "ra_ide 0.1.0",
@@ -1170,7 +1169,7 @@ dependencies = [
1170 "crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", 1169 "crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
1171 "jod-thread 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", 1170 "jod-thread 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
1172 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", 1171 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
1173 "notify 4.0.14 (registry+https://github.com/rust-lang/crates.io-index)", 1172 "notify 4.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
1174 "parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", 1173 "parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
1175 "relative-path 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", 1174 "relative-path 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
1176 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", 1175 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1208,7 +1207,7 @@ name = "rand"
1208version = "0.7.2" 1207version = "0.7.2"
1209source = "registry+https://github.com/rust-lang/crates.io-index" 1208source = "registry+https://github.com/rust-lang/crates.io-index"
1210dependencies = [ 1209dependencies = [
1211 "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", 1210 "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
1212 "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", 1211 "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
1213 "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", 1212 "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
1214 "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", 1213 "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1252,7 +1251,7 @@ name = "rand_core"
1252version = "0.5.1" 1251version = "0.5.1"
1253source = "registry+https://github.com/rust-lang/crates.io-index" 1252source = "registry+https://github.com/rust-lang/crates.io-index"
1254dependencies = [ 1253dependencies = [
1255 "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", 1254 "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
1256] 1255]
1257 1256
1258[[package]] 1257[[package]]
@@ -1698,7 +1697,7 @@ dependencies = [
1698 1697
1699[[package]] 1698[[package]]
1700name = "wasi" 1699name = "wasi"
1701version = "0.7.0" 1700version = "0.9.0+wasi-snapshot-preview1"
1702source = "registry+https://github.com/rust-lang/crates.io-index" 1701source = "registry+https://github.com/rust-lang/crates.io-index"
1703 1702
1704[[package]] 1703[[package]]
@@ -1783,7 +1782,7 @@ dependencies = [
1783"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" 1782"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
1784"checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" 1783"checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
1785"checksum cargo_metadata 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "46e3374c604fb39d1a2f35ed5e4a4e30e60d01fab49446e08f1b3e9a90aef202" 1784"checksum cargo_metadata 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "46e3374c604fb39d1a2f35ed5e4a4e30e60d01fab49446e08f1b3e9a90aef202"
1786"checksum cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)" = "f52a465a666ca3d838ebbf08b241383421412fe7ebb463527bba275526d89f76" 1785"checksum cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)" = "e450b8da92aa6f274e7c6437692f9f2ce6d701fb73bacfcf87897b3f89a4c20e"
1787"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" 1786"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
1788"checksum chalk-derive 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5)" = "<none>" 1787"checksum chalk-derive 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5)" = "<none>"
1789"checksum chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git?rev=ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5)" = "<none>" 1788"checksum chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git?rev=ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5)" = "<none>"
@@ -1818,14 +1817,14 @@ dependencies = [
1818"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" 1817"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
1819"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" 1818"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
1820"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" 1819"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
1821"checksum getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407" 1820"checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
1822"checksum globset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "925aa2cac82d8834e2b2a4415b6f6879757fb5c0928fc445ae76461a12eed8f2" 1821"checksum globset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "925aa2cac82d8834e2b2a4415b6f6879757fb5c0928fc445ae76461a12eed8f2"
1823"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" 1822"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
1824"checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772" 1823"checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772"
1825"checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" 1824"checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
1826"checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" 1825"checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
1827"checksum indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712d7b3ea5827fcb9d4fda14bf4da5f136f0db2ae9c8f4bd4e2d1c6fde4e6db2" 1826"checksum indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712d7b3ea5827fcb9d4fda14bf4da5f136f0db2ae9c8f4bd4e2d1c6fde4e6db2"
1828"checksum inotify 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "40b54539f3910d6f84fbf9a643efd6e3aa6e4f001426c0329576128255994718" 1827"checksum inotify 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "24e40d6fd5d64e2082e0c796495c8ef5ad667a96d03e5aaa0becfd9d47bcbfb8"
1829"checksum inotify-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e74a1aa87c59aeff6ef2cc2fa62d41bc43f54952f55652656b18a02fd5e356c0" 1828"checksum inotify-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e74a1aa87c59aeff6ef2cc2fa62d41bc43f54952f55652656b18a02fd5e356c0"
1830"checksum insta 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0d499dc062e841590a67230d853bce62d0abeb91304927871670b7c55c461349" 1829"checksum insta 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0d499dc062e841590a67230d853bce62d0abeb91304927871670b7c55c461349"
1831"checksum iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" 1830"checksum iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
@@ -1845,7 +1844,7 @@ dependencies = [
1845"checksum lock_api 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "79b2de95ecb4691949fea4716ca53cdbcfccb2c612e19644a8bad05edcf9f47b" 1844"checksum lock_api 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "79b2de95ecb4691949fea4716ca53cdbcfccb2c612e19644a8bad05edcf9f47b"
1846"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" 1845"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
1847"checksum lsp-server 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5383e043329615624bbf45e1ba27bd75c176762b2592855c659bc28ac580a06b" 1846"checksum lsp-server 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5383e043329615624bbf45e1ba27bd75c176762b2592855c659bc28ac580a06b"
1848"checksum lsp-types 0.68.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1b08121a463f43ee67f09da45c0a61d447793adc8dc23e52b009e8cf80278a16" 1847"checksum lsp-types 0.68.1 (registry+https://github.com/rust-lang/crates.io-index)" = "19b79f72914b929daa263483134b8974962cdebc731593b11508afb7f9acec80"
1849"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" 1848"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
1850"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" 1849"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
1851"checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9" 1850"checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9"
@@ -1853,7 +1852,7 @@ dependencies = [
1853"checksum mio-extras 2.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" 1852"checksum mio-extras 2.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19"
1854"checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" 1853"checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
1855"checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" 1854"checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
1856"checksum notify 4.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "199628fc33b21bc767baa057490b00b382ecbae030803a7b36292422d15b778b" 1855"checksum notify 4.0.15 (registry+https://github.com/rust-lang/crates.io-index)" = "80ae4a7688d1fab81c5bf19c64fc8db920be8d519ce6336ed4e7efe024724dbd"
1857"checksum num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c81ffc11c212fa327657cb19dd85eb7419e163b5b076bede2bdb5c974c07e4" 1856"checksum num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c81ffc11c212fa327657cb19dd85eb7419e163b5b076bede2bdb5c974c07e4"
1858"checksum num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76dac5ed2a876980778b8b85f75a71b6cbf0db0b1232ee12f826bccb00d09d72" 1857"checksum num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76dac5ed2a876980778b8b85f75a71b6cbf0db0b1232ee12f826bccb00d09d72"
1859"checksum once_cell 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "891f486f630e5c5a4916c7e16c4b24a53e78c860b646e9f8e005e4f16847bfed" 1858"checksum once_cell 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "891f486f630e5c5a4916c7e16c4b24a53e78c860b646e9f8e005e4f16847bfed"
@@ -1932,7 +1931,7 @@ dependencies = [
1932"checksum uuid 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11" 1931"checksum uuid 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11"
1933"checksum version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce" 1932"checksum version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce"
1934"checksum walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e" 1933"checksum walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e"
1935"checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d" 1934"checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
1936"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" 1935"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
1937"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" 1936"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
1938"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" 1937"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
diff --git a/crates/ra_lsp_server/src/caps.rs b/crates/ra_lsp_server/src/caps.rs
index adfc9fb2c..db502c200 100644
--- a/crates/ra_lsp_server/src/caps.rs
+++ b/crates/ra_lsp_server/src/caps.rs
@@ -56,6 +56,7 @@ pub fn server_capabilities() -> ServerCapabilities {
56 color_provider: None, 56 color_provider: None,
57 execute_command_provider: None, 57 execute_command_provider: None,
58 workspace: None, 58 workspace: None,
59 call_hierarchy_provider: None,
59 experimental: Default::default(), 60 experimental: Default::default(),
60 } 61 }
61} 62}
diff --git a/xtask/src/lib.rs b/xtask/src/lib.rs
index b76278635..e46c21db7 100644
--- a/xtask/src/lib.rs
+++ b/xtask/src/lib.rs
@@ -9,7 +9,7 @@ mod ast_src;
9 9
10use anyhow::Context; 10use anyhow::Context;
11use std::{ 11use std::{
12 env, 12 env, fs,
13 path::{Path, PathBuf}, 13 path::{Path, PathBuf},
14 process::{Command, Stdio}, 14 process::{Command, Stdio},
15}; 15};
@@ -101,3 +101,41 @@ pub fn run_fuzzer() -> Result<()> {
101 101
102 run("rustup run nightly -- cargo fuzz run parser", "./crates/ra_syntax") 102 run("rustup run nightly -- cargo fuzz run parser", "./crates/ra_syntax")
103} 103}
104
105/// Cleans the `./target` dir after the build such that only
106/// dependencies are cached on CI.
107pub fn run_pre_cache() -> Result<()> {
108 let slow_tests_cookie = Path::new("./target/.slow_tests_cookie");
109 if !slow_tests_cookie.exists() {
110 panic!("slow tests were skipped on CI!")
111 }
112 rm_rf(slow_tests_cookie)?;
113
114 for entry in Path::new("./target/debug").read_dir()? {
115 let entry = entry?;
116 if entry.file_type().map(|it| it.is_file()).ok() == Some(true) {
117 // Can't delete yourself on windows :-(
118 if !entry.path().ends_with("xtask.exe") {
119 rm_rf(&entry.path())?
120 }
121 }
122 }
123
124 fs::remove_file("./target/.rustc_info.json")?;
125 let to_delete = ["ra_", "heavy_test"];
126 for &dir in ["./target/debug/deps", "target/debug/.fingerprint"].iter() {
127 for entry in Path::new(dir).read_dir()? {
128 let entry = entry?;
129 if to_delete.iter().any(|&it| entry.path().display().to_string().contains(it)) {
130 rm_rf(&entry.path())?
131 }
132 }
133 }
134
135 Ok(())
136}
137
138fn rm_rf(path: &Path) -> Result<()> {
139 if path.is_file() { fs::remove_file(path) } else { fs::remove_dir_all(path) }
140 .with_context(|| format!("failed to remove {:?}", path))
141}
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index 9309b2fbd..053453e6e 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -14,7 +14,7 @@ use pico_args::Arguments;
14use xtask::{ 14use xtask::{
15 codegen::{self, Mode}, 15 codegen::{self, Mode},
16 install::{ClientOpt, InstallCmd, ServerOpt}, 16 install::{ClientOpt, InstallCmd, ServerOpt},
17 pre_commit, run_clippy, run_fuzzer, run_rustfmt, Result, 17 pre_commit, run_clippy, run_fuzzer, run_pre_cache, run_rustfmt, Result,
18}; 18};
19 19
20fn main() -> Result<()> { 20fn main() -> Result<()> {
@@ -88,6 +88,10 @@ FLAGS:
88 args.finish()?; 88 args.finish()?;
89 run_fuzzer() 89 run_fuzzer()
90 } 90 }
91 "pre-cache" => {
92 args.finish()?;
93 run_pre_cache()
94 }
91 _ => { 95 _ => {
92 eprintln!( 96 eprintln!(
93 "\ 97 "\