Skip to content

Update cargo, rls, books #58920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 9, 2019
Merged

Update cargo, rls, books #58920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9243f9c
Update cargo, rls
ehuss Mar 4, 2019
0609029
Update books
ehuss Mar 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,15 +230,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

[[package]]
name = "cargo"
version = "0.35.0"
version = "0.36.0"
dependencies = [
"atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"bufstream 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
"bytesize 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-foundation 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
"crates-io 0.23.0",
"crates-io 0.24.0",
"crossbeam-utils 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
"crypto-hash 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"curl 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)",
Expand Down Expand Up @@ -540,7 +540,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

[[package]]
name = "crates-io"
version = "0.23.0"
version = "0.24.0"
dependencies = [
"curl 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)",
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
Expand Down Expand Up @@ -1340,7 +1340,7 @@ dependencies = [

[[package]]
name = "lsp-codec"
version = "0.1.1"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
Expand Down Expand Up @@ -2232,7 +2232,7 @@ dependencies = [
name = "rls"
version = "1.34.0"
dependencies = [
"cargo 0.35.0",
"cargo 0.36.0",
"cargo_metadata 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
"clippy_lints 0.0.212",
"crossbeam-channel 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
Expand All @@ -2246,7 +2246,7 @@ dependencies = [
"jsonrpc-core 10.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"lsp-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"lsp-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"lsp-types 0.55.4 (registry+https://github.com/rust-lang/crates.io-index)",
"num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ordslice 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
Expand Down Expand Up @@ -4118,7 +4118,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum lock_api 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "949826a5ccf18c1b3a7c3d57692778d21768b79e46eb9dd07bfc4c2160036c54"
"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
"checksum log_settings 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "19af41f0565d7c19b2058153ad0b42d4d5ce89ec4dbf06ed6741114a8b63e7cd"
"checksum lsp-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f3570f641b984e3e4613a1ca34db2ea72549bbc3c0316d33f5af91ab514dcbff"
"checksum lsp-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "169d737ad89cf8ddd82d1804d9122f54568c49377665157277cc90d747b1d31a"
"checksum lsp-types 0.55.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6392b5843615b8a2adeebe87b83fdd29567c0870baba3407a67e6dbfee4712f8"
"checksum lzma-sys 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d1eaa027402541975218bb0eec67d6b0412f6233af96e0d096d31dbdfd22e614"
"checksum mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
Expand Down
2 changes: 1 addition & 1 deletion src/doc/book
Open in desktop
Submodule book updated 14 files
+0 −245 2018-edition/nostarch/appendices-d-and-e.md
+0 −1,024 2018-edition/nostarch/chapter07.md
+0 −595 2018-edition/nostarch/chapter19.md
+1 −0 ci/dictionary.txt
+89 −98 nostarch/appendices-d-and-e.md
+17 −15 nostarch/appendix-a-new-section.md
+11 −10 nostarch/chapter19-new-function-pointer-text.md
+ − nostarch/docx/appendices-d-and-e.docx
+ − nostarch/docx/appendix-a-new-section.docx
+ − nostarch/docx/chapter19-new-function-pointer-text.docx
+20 −19 src/appendix-01-keywords.md
+42 −40 src/appendix-04-useful-development-tools.md
+43 −43 src/appendix-05-editions.md
+10 −10 src/ch19-05-advanced-functions-and-closures.md
2 changes: 1 addition & 1 deletion src/doc/edition-guide
Open in desktop
Submodule edition-guide updated from 5f3cc2 to aa0022
2 changes: 1 addition & 1 deletion src/doc/embedded-book
Open in desktop
Submodule embedded-book updated 12 files
+1 −1 src/SUMMARY.md
+3 −3 src/c-tips/index.md
+12 −17 src/intro/hardware.md
+5 −5 src/intro/index.md
+19 −2 src/intro/install.md
+0 −1 src/intro/install/macos.md
+9 −7 src/intro/no-std.md
+8 −9 src/intro/tooling.md
+5 −4 src/start/exceptions.md
+5 −5 src/start/panicking.md
+5 −5 src/start/qemu.md
+5 −5 src/unsorted/speed-vs-size.md
2 changes: 1 addition & 1 deletion src/doc/nomicon
Open in desktop
Submodule nomicon updated from b7eb4a to f1ff93
2 changes: 1 addition & 1 deletion src/doc/reference
Open in desktop
Submodule reference updated from 1c775a to 41493f
2 changes: 1 addition & 1 deletion src/tools/cargo
Open in desktop
Submodule cargo updated 51 files
+31 −14 ARCHITECTURE.md
+1 −1 CONTRIBUTING.md
+2 −2 Cargo.toml
+2 −2 LICENSE-APACHE
+6 −6 LICENSE-THIRD-PARTY
+1 −1 README.md
+3 −11 src/bin/cargo/commands/bench.rs
+2 −2 src/bin/cargo/commands/fix.rs
+1 −1 src/bin/cargo/commands/pkgid.rs
+1 −1 src/bin/cargo/commands/run.rs
+23 −21 src/bin/cargo/commands/test.rs
+13 −4 src/cargo/core/compiler/context/compilation_files.rs
+5 −8 src/cargo/core/compiler/custom_build.rs
+57 −21 src/cargo/core/compiler/fingerprint.rs
+2 −1 src/cargo/core/compiler/mod.rs
+12 −0 src/cargo/core/dependency.rs
+9 −9 src/cargo/core/package_id_spec.rs
+13 −16 src/cargo/core/resolver/conflict_cache.rs
+25 −4 src/cargo/core/resolver/context.rs
+15 −11 src/cargo/core/resolver/errors.rs
+136 −18 src/cargo/core/resolver/mod.rs
+3 −4 src/cargo/core/resolver/resolve.rs
+8 −1 src/cargo/core/resolver/types.rs
+43 −10 src/cargo/ops/cargo_compile.rs
+1 −1 src/cargo/ops/cargo_package.rs
+9 −6 src/cargo/ops/cargo_test.rs
+1 −1 src/cargo/ops/common_for_install_and_uninstall.rs
+1 −1 src/cargo/ops/mod.rs
+2 −2 src/cargo/ops/registry.rs
+1 −0 src/cargo/ops/resolve.rs
+2 −5 src/cargo/util/command_prelude.rs
+2 −2 src/cargo/util/diagnostic_server.rs
+36 −18 src/cargo/util/graph.rs
+5 −4 src/cargo/util/paths.rs
+1 −1 src/crates-io/Cargo.toml
+1 −1 src/doc/man/cargo.adoc
+1 −1 src/doc/man/generated/cargo.html
+1 −1 src/doc/src/appendix/glossary.md
+1 −1 src/doc/src/reference/manifest.md
+1 −1 src/doc/src/reference/pkgid-spec.md
+1 −1 src/etc/man/cargo.1
+8 −8 tests/testsuite/bad_config.rs
+9 −9 tests/testsuite/build.rs
+2 −5 tests/testsuite/doc.rs
+88 −1 tests/testsuite/freshness.rs
+1 −1 tests/testsuite/git.rs
+2 −2 tests/testsuite/net_config.rs
+9 −9 tests/testsuite/package.rs
+140 −10 tests/testsuite/resolve.rs
+31 −13 tests/testsuite/support/resolver.rs
+37 −5 tests/testsuite/test.rs
2 changes: 1 addition & 1 deletion src/tools/rls
Open in desktop
Submodule rls updated from 0d6f53 to 6a1b5a