Skip to content

Commit 777cc25

Browse files
committed
Auto merge of #58920 - ehuss:update-cargo-rls, r=ehuss
Update cargo, rls, books ## cargo 10 commits in 5c6aa46e6f28661270979696e7b4c2f0dff8628f..95b45eca19ac785263fed98ecefe540bb47337ac 2019-02-22 19:32:35 +0000 to 2019-03-06 19:24:30 +0000 - Relax some rustdoc tests. (rust-lang/cargo#6721) - Include build script execution in the fingerprint. (rust-lang/cargo#6720) - part of the infrastructure for public & private dependencies in the resolver (rust-lang/cargo#6653) - Bump to 0.36.0 (rust-lang/cargo#6718) - Some test/bench-related tweaks (rust-lang/cargo#6707) - Fix links to the permanent home of the edition guide. (rust-lang/cargo#6703) - HTTPS all the things (rust-lang/cargo#6614) - Cargo test quicker by not building untested examples when filtered (rust-lang/cargo#6683) - Link from ARCHITECTURE.md to docs.rs and github (rust-lang/cargo#6695) - Update how to install rustfmt (rust-lang/cargo#6696) ## rls 9 commits in 0d6f53e1a4adbaf7d83cdc0cb54720203fcb522e..6a1b5a9cfda2ae19372e0613e76ebefba36edcf5 2019-02-14 07:52:15 +0000 to 2019-03-04 20:24:45 +0000 - Update cargo and clippy. (rust-lang/rls#1388) - catch up rust-lang/rust PR#58321 (rust-lang/rls#1384) - Apply Clippy fixes (rust-lang/rls#1327) - Various cosmetic improvements (rust-lang/rls#1326) - Make test `RlsHandle` transport-agnostic (rust-lang/rls#1317) - Translate remaining tests (rust-lang/rls#1320) - Remove unnecessary #![feature]s (rust-lang/rls#1323) - Update Clippy (rust-lang/rls#1319) - Update Clippy (rust-lang/rls#1315) cc @Xanewok ## Books See #58936 for details.
2 parents b2ea6c8 + 0609029 commit 777cc25

File tree

8 files changed

+14
-14
lines changed

8 files changed

+14
-14
lines changed

Cargo.lock

+7-7
Original file line numberDiff line numberDiff line change
@@ -230,15 +230,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
230230

231231
[[package]]
232232
name = "cargo"
233-
version = "0.35.0"
233+
version = "0.36.0"
234234
dependencies = [
235235
"atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
236236
"bufstream 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
237237
"byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
238238
"bytesize 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
239239
"clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
240240
"core-foundation 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
241-
"crates-io 0.23.0",
241+
"crates-io 0.24.0",
242242
"crossbeam-utils 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
243243
"crypto-hash 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
244244
"curl 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -540,7 +540,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
540540

541541
[[package]]
542542
name = "crates-io"
543-
version = "0.23.0"
543+
version = "0.24.0"
544544
dependencies = [
545545
"curl 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)",
546546
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1340,7 +1340,7 @@ dependencies = [
13401340

13411341
[[package]]
13421342
name = "lsp-codec"
1343-
version = "0.1.1"
1343+
version = "0.1.2"
13441344
source = "registry+https://github.com/rust-lang/crates.io-index"
13451345
dependencies = [
13461346
"bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2232,7 +2232,7 @@ dependencies = [
22322232
name = "rls"
22332233
version = "1.34.0"
22342234
dependencies = [
2235-
"cargo 0.35.0",
2235+
"cargo 0.36.0",
22362236
"cargo_metadata 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
22372237
"clippy_lints 0.0.212",
22382238
"crossbeam-channel 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2246,7 +2246,7 @@ dependencies = [
22462246
"jsonrpc-core 10.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
22472247
"lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
22482248
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
2249-
"lsp-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
2249+
"lsp-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
22502250
"lsp-types 0.55.4 (registry+https://github.com/rust-lang/crates.io-index)",
22512251
"num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
22522252
"ordslice 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4118,7 +4118,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
41184118
"checksum lock_api 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "949826a5ccf18c1b3a7c3d57692778d21768b79e46eb9dd07bfc4c2160036c54"
41194119
"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
41204120
"checksum log_settings 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "19af41f0565d7c19b2058153ad0b42d4d5ce89ec4dbf06ed6741114a8b63e7cd"
4121-
"checksum lsp-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f3570f641b984e3e4613a1ca34db2ea72549bbc3c0316d33f5af91ab514dcbff"
4121+
"checksum lsp-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "169d737ad89cf8ddd82d1804d9122f54568c49377665157277cc90d747b1d31a"
41224122
"checksum lsp-types 0.55.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6392b5843615b8a2adeebe87b83fdd29567c0870baba3407a67e6dbfee4712f8"
41234123
"checksum lzma-sys 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d1eaa027402541975218bb0eec67d6b0412f6233af96e0d096d31dbdfd22e614"
41244124
"checksum mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"

src/doc/edition-guide

src/doc/nomicon

src/doc/reference

src/tools/cargo

Submodule cargo updated 51 files

src/tools/rls

Submodule rls updated from 0d6f53e to 6a1b5a9

0 commit comments

Comments
 (0)