OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #69097 - Xanewok:update-rls-rustfmt, r=Dylan-DPC 

Update RLS and Rustfmt

Bumps `rustc-ap-*` packages to v642.

Closes #68916.
Closes #68917.

cc @topecongiro
This commit is contained in:
bors 2020-02-13 01:40:54 +00:00
parent 92d8e82f6b 8fc4bba2c4
commit ba18875557
3 changed files with 236 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

358
Cargo.lock
View File

@ -292,7 +292,7 @@ dependencies = [
"clap",
"core-foundation 0.7.0",
"crates-io",
"crossbeam-channel 0.4.0",
"crossbeam-channel",
"crossbeam-utils 0.7.0",
"crypto-hash",
"curl",
@ -720,16 +720,6 @@ dependencies = [
"cfg-if",
]
[[package]]
name = "crossbeam-channel"
version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f0ed1a4de2235cabda8558ff5840bffb97fcb64c97827f354a451307df5f72b"
dependencies = [
"crossbeam-utils 0.6.5",
"smallvec 0.6.10",
]
[[package]]
name = "crossbeam-channel"
version = "0.4.0"
@ -889,14 +879,13 @@ dependencies = [
[[package]]
name = "derive_more"
version = "0.13.0"
version = "0.99.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f57d78cf3bd45270dad4e70c21ec77a960b36c7a841ff9db76aaa775a8fb871"
checksum = "2159be042979966de68315bce7034bb000c775f22e3e834e1c52ff78f041cae8"
dependencies = [
"proc-macro2 0.4.30",
"quote 0.6.12",
"rustc_version",
"syn 0.15.35",
"proc-macro2 1.0.3",
"quote 1.0.2",
"syn 1.0.11",
]
[[package]]
@ -1548,18 +1537,18 @@ checksum = "c3360c7b59e5ffa2653671fb74b4741a5d343c03f331c0a4aeda42b5c2b0ec7d"
[[package]]
name = "ignore"
version = "0.4.10"
version = "0.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ec16832258409d571aaef8273f3c3cc5b060d784e159d1a0f3b0017308f84a7"
checksum = "522daefc3b69036f80c7d2990b28ff9e0471c683bad05ca258e0a01dd22c5a1e"
dependencies = [
"crossbeam-channel 0.3.8",
"crossbeam-channel",
"globset",
"lazy_static 1.4.0",
"log",
"memchr",
"regex",
"same-file",
"thread_local",
"thread_local 1.0.1",
"walkdir",
"winapi-util",
]
@ -1668,9 +1657,9 @@ checksum = "9ad0485404155f45cce53a40d4b2d6ac356418300daed05273d9e26f91c390be"
[[package]]
name = "jsonrpc-client-transports"
version = "13.1.0"
version = "14.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39577db48b004cffb4c5b8e5c9b993c177c52599ecbee88711e815acf65144db"
checksum = "0a9ae166c4d1f702d297cd76d4b55758ace80272ffc6dbb139fdc1bf810de40b"
dependencies = [
"failure",
"futures",
@ -1687,9 +1676,9 @@ dependencies = [
[[package]]
name = "jsonrpc-core"
version = "13.2.0"
version = "14.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "91d767c183a7e58618a609499d359ce3820700b3ebb4823a18c343b4a2a41a0d"
checksum = "fe3b688648f1ef5d5072229e2d672ecb92cbff7d1c79bcf3fd5898f3f3df0970"
dependencies = [
"futures",
"log",
@ -1700,63 +1689,62 @@ dependencies = [
[[package]]
name = "jsonrpc-core-client"
version = "13.1.0"
version = "14.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f047c10738edee7c3c6acf5241a0ce33df32ef9230c1a7fb03e4a77ee72c992f"
checksum = "080dc110be17701097df238fad3c816d4a478a1899dfbcf8ec8957dd40ec7304"
dependencies = [
"jsonrpc-client-transports",
]
[[package]]
name = "jsonrpc-derive"
version = "13.1.0"
version = "14.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "29f9149f785deaae92a4c834a9a1a83a4313b8cfedccf15362cd4cf039a64501"
checksum = "8609af8f63b626e8e211f52441fcdb6ec54f1a446606b10d5c89ae9bf8a20058"
dependencies = [
"proc-macro-crate",
"proc-macro2 0.4.30",
"quote 0.6.12",
"syn 0.15.35",
"proc-macro2 1.0.3",
"quote 1.0.2",
"syn 1.0.11",
]
[[package]]
name = "jsonrpc-ipc-server"
version = "13.1.0"
version = "14.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "256c5e4292c17b4c2ecdf542299dc8e9d6b3939c075c54825570ad9317fe5751"
checksum = "b579cd0840d7db3ebaadf52f6f31ec601a260e78d610e44f68634f919e34497a"
dependencies = [
"jsonrpc-core",
"jsonrpc-server-utils",
"log",
"parity-tokio-ipc",
"parking_lot",
"parking_lot 0.9.0",
"tokio-service",
]
[[package]]
name = "jsonrpc-pubsub"
version = "13.1.0"
version = "14.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2c08b444cc0ed70263798834343d0ac875e664257df8079160f23ac1ea79446"
checksum = "5b31c9b90731276fdd24d896f31bb10aecf2e5151733364ae81123186643d939"
dependencies = [
"jsonrpc-core",
"log",
"parking_lot",
"parking_lot 0.10.0",
"serde",
]
[[package]]
name = "jsonrpc-server-utils"
version = "13.1.0"
version = "14.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44561bfdd31401bad790527f1e951dde144f2341ddc3e1b859d32945e1a34eff"
checksum = "95b7635e618a0edbbe0d2a2bbbc69874277c49383fcf6c3c0414491cfb517d22"
dependencies = [
"bytes",
"globset",
"jsonrpc-core",
"lazy_static 1.4.0",
"log",
"num_cpus",
"tokio",
"tokio-codec",
"unicase",
@ -2020,7 +2008,7 @@ checksum = "fef709d3257013bba7cff14fc504e07e80631d3fe0f6d38ce63b8f6510ccb932"
dependencies = [
"byteorder",
"memmap",
"parking_lot",
"parking_lot 0.9.0",
"rustc-hash",
]
@ -2362,10 +2350,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252"
dependencies = [
"lock_api",
"parking_lot_core",
"parking_lot_core 0.6.2",
"rustc_version",
]
[[package]]
name = "parking_lot"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "92e98c49ab0b7ce5b222f2cc9193fc4efe11c6d0bd4f648e374684a6857b1cfc"
dependencies = [
"lock_api",
"parking_lot_core 0.7.0",
]
[[package]]
name = "parking_lot_core"
version = "0.6.2"
@ -2381,6 +2379,20 @@ dependencies = [
"winapi 0.3.8",
]
[[package]]
name = "parking_lot_core"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7582838484df45743c8434fbff785e8edf260c28748353d44bc0da32e0ceabf1"
dependencies = [
"cfg-if",
"cloudabi",
"libc",
"redox_syscall",
"smallvec 1.0.0",
"winapi 0.3.8",
]
[[package]]
name = "percent-encoding"
version = "1.0.1"
@ -2651,18 +2663,24 @@ dependencies = [
[[package]]
name = "racer"
version = "2.1.29"
version = "2.1.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a6d7ffceb4da3e0a29c18986f0469c209f4db3ab9f2ffe286eaa1104a3e5028"
checksum = "0ff33fa15ac0384376741d16ddb05a65263dde4e2c5d0f7a9f3747db788764aa"
dependencies = [
"bitflags",
"clap",
"derive_more",
"env_logger 0.6.2",
"humantime 1.3.0",
"env_logger 0.7.1",
"humantime 2.0.0",
"lazy_static 1.4.0",
"log",
"rls-span",
"rustc-ap-rustc_ast_pretty",
"rustc-ap-rustc_data_structures",
"rustc-ap-rustc_errors",
"rustc-ap-rustc_parse",
"rustc-ap-rustc_session",
"rustc-ap-rustc_span",
"rustc-ap-syntax",
]
@ -2886,7 +2904,7 @@ dependencies = [
"aho-corasick",
"memchr",
"regex-syntax",
"thread_local",
"thread_local 0.3.6",
"utf8-ranges",
]
@ -2958,7 +2976,7 @@ dependencies = [
"cargo",
"cargo_metadata 0.8.0",
"clippy_lints",
"crossbeam-channel 0.3.8",
"crossbeam-channel",
"difference",
"env_logger 0.7.1",
"futures",
@ -3043,7 +3061,6 @@ version = "0.6.0"
dependencies = [
"clippy_lints",
"env_logger 0.7.1",
"failure",
"futures",
"log",
"rand 0.7.3",
@ -3099,7 +3116,7 @@ dependencies = [
"jobserver",
"log",
"measureme",
"parking_lot",
"parking_lot 0.9.0",
"polonius-engine",
"rustc-rayon",
"rustc-rayon-core",
@ -3122,26 +3139,57 @@ dependencies = [
[[package]]
name = "rustc-ap-arena"
version = "610.0.0"
version = "642.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7475f4c707269b56eb7144c53591e3cd6369a5aa1d66434829ea11df96d5e7e3"
checksum = "ea82fa3d9a8add7422228ca1a2cbba0784fa8861f56148ff64da08b3c7921b03"
dependencies = [
"rustc-ap-rustc_data_structures",
"smallvec 0.6.10",
"smallvec 1.0.0",
]
[[package]]
name = "rustc-ap-graphviz"
version = "610.0.0"
version = "642.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e59a55520f140a70a3e0fad80a36e807caa85e9d7016167b91a5b521ea929be"
checksum = "638d0b2b3bcf99824e0cb5a25dbc547b61dc20942e11daf6a97e981918aa18e5"
[[package]]
name = "rustc-ap-rustc_ast_pretty"
version = "642.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d38bab04dd676dee6d2f9670506a18c31bfce38bf7f8420aa83eb1140ecde049"
dependencies = [
"log",
"rustc-ap-rustc_data_structures",
"rustc-ap-rustc_span",
"rustc-ap-syntax",
]
[[package]]
name = "rustc-ap-rustc_attr"
version = "642.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "10b843ba8b1ed43739133047673b9f6a54d3b3b4d328d69c6ea89ff971395f35"
dependencies = [
"rustc-ap-rustc_ast_pretty",
"rustc-ap-rustc_data_structures",
"rustc-ap-rustc_errors",
"rustc-ap-rustc_feature",
"rustc-ap-rustc_macros",
"rustc-ap-rustc_session",
"rustc-ap-rustc_span",
"rustc-ap-serialize",
"rustc-ap-syntax",
"smallvec 1.0.0",
]
[[package]]
name = "rustc-ap-rustc_data_structures"
version = "610.0.0"
version = "642.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6420857d5a088f680ec1ba736ffba4ee9c1964b0d397e6318f38d461f4f7d5cb"
checksum = "dc3d1c6d0a80ab0c1df76405377cec0f3d5423fb5b0953a8eac70a2ad6c44df2"
dependencies = [
"bitflags",
"cfg-if",
"crossbeam-utils 0.6.5",
"ena",
@ -3149,58 +3197,78 @@ dependencies = [
"jobserver",
"lazy_static 1.4.0",
"log",
"parking_lot",
"measureme",
"parking_lot 0.9.0",
"rustc-ap-graphviz",
"rustc-ap-rustc_index",
"rustc-ap-serialize",
"rustc-hash",
"rustc-rayon",
"rustc-rayon-core",
"smallvec 0.6.10",
"smallvec 1.0.0",
"stable_deref_trait",
"winapi 0.3.8",
]
[[package]]
name = "rustc-ap-rustc_errors"
version = "610.0.0"
version = "642.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8abfca0960131262254a91d02ff4903526a261ede730d7a2c75b4234c867cdc0"
checksum = "4909a1eca29331332257230f29120a8ff68c9e37d868c564fcd599e430cf8914"
dependencies = [
"annotate-snippets",
"atty",
"log",
"rustc-ap-rustc_data_structures",
"rustc-ap-rustc_span",
"rustc-ap-serialize",
"rustc-ap-syntax_pos",
"term_size",
"termcolor",
"termize",
"unicode-width",
"winapi 0.3.8",
]
[[package]]
name = "rustc-ap-rustc_index"
version = "610.0.0"
name = "rustc-ap-rustc_feature"
version = "642.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a395509dcb90a92c1479c085639594624e06b4ab3fc7c1b795b46a61f2d4f65"
checksum = "63ab887a181d795cf5fd3edadf367760deafb90aefb844f168ab5255266e3478"
dependencies = [
"lazy_static 1.4.0",
"rustc-ap-rustc_data_structures",
"rustc-ap-rustc_span",
]
[[package]]
name = "rustc-ap-rustc_fs_util"
version = "642.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "70814116df3c5fbec8f06f6a1d013ca481f620fd22a9475754e9bf3ee9ba70d8"
[[package]]
name = "rustc-ap-rustc_index"
version = "642.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac1bf1d3cf3d119d41353d6fd229ef7272d5097bc0924de021c0294bf86d48bf"
dependencies = [
"rustc-ap-serialize",
"smallvec 0.6.10",
"smallvec 1.0.0",
]
[[package]]
name = "rustc-ap-rustc_lexer"
version = "610.0.0"
version = "642.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "64eac8a0e6efb8f55292aa24be0208c7c0538236c613e79952fd1fa3d54bcf8e"
checksum = "4cda21a32cebdc11ec4f5393aa2fcde5ed1b2f673a8571e5a4dcdf07e4ae9cac"
dependencies = [
"unicode-xid 0.2.0",
]
[[package]]
name = "rustc-ap-rustc_macros"
version = "610.0.0"
version = "642.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f99795e8be4877e9e05d59f201e1740c1cf673364655def5848606d9e25b75af"
checksum = "75c47b48ea51910ecfd853c9248a9bf4c767bc823449ab6a1d864dff65fbae16"
dependencies = [
"itertools 0.8.0",
"proc-macro2 1.0.3",
@ -3210,56 +3278,53 @@ dependencies = [
]
[[package]]
name = "rustc-ap-rustc_target"
version = "610.0.0"
name = "rustc-ap-rustc_parse"
version = "642.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f22e21fdd8e1c0030f507158fa79b9f1e080e6241aba994d0f97c14a0a07a826"
checksum = "abd88e89cd5b5d28dcd3a347a3d534c08627d9455570dc1a2d402cb8437b9d30"
dependencies = [
"bitflags",
"log",
"rustc-ap-rustc_data_structures",
"rustc-ap-rustc_index",
"rustc-ap-serialize",
"rustc-ap-syntax_pos",
]
[[package]]
name = "rustc-ap-serialize"
version = "610.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb1cd6ef5135408d62559866e79986ca261f4c1333253d500e5e66fe66d1432e"
dependencies = [
"indexmap",
"smallvec 0.6.10",
]
[[package]]
name = "rustc-ap-syntax"
version = "610.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61fc1c901d2cbd24cae95d7bc5a58aa7661ec3dc5320c78c32830a52a685c33c"
dependencies = [
"bitflags",
"lazy_static 1.4.0",
"log",
"rustc-ap-rustc_ast_pretty",
"rustc-ap-rustc_attr",
"rustc-ap-rustc_data_structures",
"rustc-ap-rustc_errors",
"rustc-ap-rustc_index",
"rustc-ap-rustc_feature",
"rustc-ap-rustc_lexer",
"rustc-ap-rustc_target",
"rustc-ap-serialize",
"rustc-ap-syntax_pos",
"scoped-tls",
"smallvec 0.6.10",
"rustc-ap-rustc_session",
"rustc-ap-rustc_span",
"rustc-ap-syntax",
"smallvec 1.0.0",
"unicode-normalization",
]
[[package]]
name = "rustc-ap-syntax_pos"
version = "610.0.0"
name = "rustc-ap-rustc_session"
version = "642.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "230534f638255853bb9f13987537e00a818435a0cc54b68d97221b6822c8f1bc"
checksum = "5b8487b4575fbb2d1fc6f1cd61225efd108a4d36817e6fb9b643d57fcae9cb12"
dependencies = [
"log",
"num_cpus",
"rustc-ap-rustc_data_structures",
"rustc-ap-rustc_errors",
"rustc-ap-rustc_feature",
"rustc-ap-rustc_fs_util",
"rustc-ap-rustc_index",
"rustc-ap-rustc_span",
"rustc-ap-rustc_target",
"rustc-ap-serialize",
"rustc-ap-syntax",
]
[[package]]
name = "rustc-ap-rustc_span"
version = "642.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f69746c0d4c21bf20a5bb2bd247261a1aa8631f04202d7303352942dde70d987"
dependencies = [
"cfg-if",
"log",
"rustc-ap-arena",
"rustc-ap-rustc_data_structures",
"rustc-ap-rustc_index",
@ -3269,6 +3334,48 @@ dependencies = [
"unicode-width",
]
[[package]]
name = "rustc-ap-rustc_target"
version = "642.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8bbc6ae09b5d42ec66edd520e8412e0615c53a7c93607fe33dc4abab60ba7c8b"
dependencies = [
"bitflags",
"log",
"rustc-ap-rustc_data_structures",
"rustc-ap-rustc_index",
"rustc-ap-rustc_macros",
"rustc-ap-rustc_span",
"rustc-ap-serialize",
]
[[package]]
name = "rustc-ap-serialize"
version = "642.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e13a1ead0252fc3d96da4c336a95950be6795f2b00c84a67ccadf26142f8cb41"
dependencies = [
"indexmap",
"smallvec 1.0.0",
]
[[package]]
name = "rustc-ap-syntax"
version = "642.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1f59f48ca3a2ec16a7e82e718ed5aadf9c9e08cf63015d28b4e774767524a6a"
dependencies = [
"log",
"rustc-ap-rustc_data_structures",
"rustc-ap-rustc_index",
"rustc-ap-rustc_lexer",
"rustc-ap-rustc_macros",
"rustc-ap-rustc_span",
"rustc-ap-serialize",
"scoped-tls",
"smallvec 1.0.0",
]
[[package]]
name = "rustc-demangle"
version = "0.1.16"
@ -3532,7 +3639,7 @@ dependencies = [
"lazy_static 1.4.0",
"log",
"measureme",
"parking_lot",
"parking_lot 0.9.0",
"rustc-hash",
"rustc-rayon",
"rustc-rayon-core",
@ -4105,7 +4212,7 @@ dependencies = [
[[package]]
name = "rustfmt-nightly"
version = "1.4.11"
version = "1.4.12"
dependencies = [
"annotate-snippets",
"bytecount",
@ -4121,9 +4228,14 @@ dependencies = [
"lazy_static 1.4.0",
"log",
"regex",
"rustc-ap-rustc_ast_pretty",
"rustc-ap-rustc_data_structures",
"rustc-ap-rustc_errors",
"rustc-ap-rustc_parse",
"rustc-ap-rustc_session",
"rustc-ap-rustc_span",
"rustc-ap-rustc_target",
"rustc-ap-syntax",
"rustc-ap-syntax_pos",
"rustc-workspace-hack",
"rustfmt-config_proc_macro",
"serde",
@ -4611,17 +4723,6 @@ dependencies = [
"winapi 0.3.8",
]
[[package]]
name = "term_size"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e5b9a66db815dcfd2da92db471106457082577c3c278d4138ab3e3b4e189327"
dependencies = [
"kernel32-sys",
"libc",
"winapi 0.2.8",
]
[[package]]
name = "termcolor"
version = "1.0.4"
@ -4695,6 +4796,15 @@ dependencies = [
"lazy_static 1.4.0",
]
[[package]]
name = "thread_local"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
dependencies = [
"lazy_static 1.4.0",
]
[[package]]
name = "tidy"
version = "0.1.0"
@ -4849,7 +4959,7 @@ dependencies = [
"log",
"mio",
"num_cpus",
"parking_lot",
"parking_lot 0.9.0",
"slab",
"tokio-executor",
"tokio-io",

2
src/tools/rls

@ -1 +1 @@
Subproject commit b27e1173969639448cd2e486b1c5f0fcb1b3b17c
Subproject commit 0100ac87b4ce5bbed6e56a62f313fbc3ff037a89

2
src/tools/rustfmt

@ -1 +1 @@
Subproject commit 1838235248bbde125bbc6c12fb493e1979088bb5
Subproject commit 9f53665f91be16c9aa7afd83f7c79357fec9152b