Skip to content

Commit

Permalink
Update cargo, rls, books.
Browse files Browse the repository at this point in the history
  • Loading branch information
@ehuss
ehuss committed Nov 25, 2019
1 parent 582a4ea commit 2b98532
Show file tree
Hide file tree
Showing 9 changed files with 69 additions and 24 deletions.
78 changes: 61 additions & 17 deletions Cargo.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,15 @@ version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"

[[package]]
name = "bitmaps"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "81e039a80914325b37fde728ef7693c212f0ac913d5599607d7b95a9484aae0b"
dependencies = [
"typenum",
]

[[package]]
name = "blake2-rfc"
version = "0.2.18"
Expand Down Expand Up @@ -274,7 +283,7 @@ dependencies = [
"cargo-test-macro",
"cargo-test-support",
"clap",
"core-foundation",
"core-foundation 0.7.0",
"crates-io",
"crossbeam-utils 0.7.0",
"crypto-hash",
Expand Down Expand Up @@ -677,7 +686,17 @@ version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4e2640d6d0bf22e82bed1b73c6aef8d5dd31e5abe6666c57e6d45e2649f4f887"
dependencies = [
"core-foundation-sys",
"core-foundation-sys 0.6.2",
"libc",
]

[[package]]
name = "core-foundation"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171"
dependencies = [
"core-foundation-sys 0.7.0",
"libc",
]

Expand All @@ -687,6 +706,12 @@ version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"

[[package]]
name = "core-foundation-sys"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"

[[package]]
name = "crates-io"
version = "0.30.0"
Expand Down Expand Up @@ -1589,13 +1614,16 @@ dependencies = [

[[package]]
name = "im-rc"
version = "13.0.0"
version = "14.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a0197597d095c0d11107975d3175173f810ee572c2501ff4de64f4f3f119806"
checksum = "e9ad726dce25993be6352b0bff048e4d2647440c0a673d32257c4fac49356d18"
dependencies = [
"rustc_version",
"bitmaps",
"rand_core 0.5.1",
"rand_xoshiro",
"sized-chunks",
"typenum",
"version_check 0.9.1",
]

[[package]]
Expand Down Expand Up @@ -2780,7 +2808,7 @@ dependencies = [
"getrandom",
"libc",
"rand_chacha 0.2.1",
"rand_core 0.5.0",
"rand_core 0.5.1",
"rand_hc 0.2.0",
]

Expand All @@ -2801,7 +2829,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
dependencies = [
"c2-chacha",
"rand_core 0.5.0",
"rand_core 0.5.1",
]

[[package]]
Expand All @@ -2818,9 +2846,9 @@ checksum = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0"

[[package]]
name = "rand_core"
version = "0.5.0"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "615e683324e75af5d43d8f7a39ffe3ee4a9dc42c5c701167a71dc59c3a493aca"
checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
dependencies = [
"getrandom",
]
Expand All @@ -2840,7 +2868,7 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
dependencies = [
"rand_core 0.5.0",
"rand_core 0.5.1",
]

[[package]]
Expand Down Expand Up @@ -2891,7 +2919,16 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77d416b86801d23dde1aa643023b775c3a462efc0ed96443add11546cdf1dca8"
dependencies = [
"rand_core 0.5.0",
"rand_core 0.5.1",
]

[[package]]
name = "rand_xoshiro"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a9fcdd2e881d02f1d9390ae47ad8e5696a9e4be7b547a1da2afbc61973217004"
dependencies = [
"rand_core 0.5.1",
]

[[package]]
Expand Down Expand Up @@ -4058,8 +4095,8 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eee63d0f4a9ec776eeb30e220f0bc1e092c3ad744b2a379e3993070364d3adc2"
dependencies = [
"core-foundation",
"core-foundation-sys",
"core-foundation 0.6.3",
"core-foundation-sys 0.6.2",
"libc",
"security-framework-sys",
]
Expand All @@ -4070,7 +4107,7 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9636f8989cbf61385ae4824b98c1aaa54c994d7d8b41f11c601ed799f0549a56"
dependencies = [
"core-foundation-sys",
"core-foundation-sys 0.6.2",
]

[[package]]
Expand Down Expand Up @@ -4202,10 +4239,11 @@ checksum = "0df90a788073e8d0235a67e50441d47db7c8ad9debd91cbf43736a2a92d36537"

[[package]]
name = "sized-chunks"
version = "0.3.0"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2a2eb3fe454976eefb479f78f9b394d34d661b647c6326a3a6e66f68bb12c26"
checksum = "62db64dd92b3b54314b1e216c274634ca2b3fe8da8b3873be670cb1ac4dad30f"
dependencies = [
"bitmaps",
"typenum",
]

Expand Down Expand Up @@ -4954,7 +4992,7 @@ version = "2.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2e2e6bd1e59e56598518beb94fd6db628ded570326f0a98c679a304bd9f00150"
dependencies = [
"version_check",
"version_check 0.1.5",
]

[[package]]
Expand Down Expand Up @@ -5105,6 +5143,12 @@ version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"

[[package]]
name = "version_check"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce"

[[package]]
name = "vte"
version = "0.3.3"
Expand Down
2 changes: 1 addition & 1 deletion src/doc/book
Submodule book updated 6 files
+0 −1 ci/dictionary.txt
+1 −1 src/ch04-03-slices.md
+1 −1 src/ch07-02-defining-modules-to-control-scope-and-privacy.md
+24 −115 src/ch16-03-shared-state.md
+6 −109 src/ch20-02-multithreaded.md
+2 −12 src/ch20-03-graceful-shutdown-and-cleanup.md
2 changes: 1 addition & 1 deletion src/doc/edition-guide
Submodule edition-guide updated 1 files
+1 −1 src/rust-2018/cargo-and-crates-io/cargo-workspaces-for-multi-package-projects.md
2 changes: 1 addition & 1 deletion src/doc/nomicon
Submodule nomicon updated 1 files
+2 −2 src/other-reprs.md
2 changes: 1 addition & 1 deletion src/doc/reference
Submodule reference updated 3 files
+2 −2 src/items/associated-items.md
+10 −0 src/items/enumerations.md
+6 −0 src/types/never.md
2 changes: 1 addition & 1 deletion src/doc/rust-by-example
Submodule rust-by-example updated 1 files
+1 −1 src/crates.md
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 76 files
+2 −2 Cargo.toml
+1 −1 crates/cargo-test-macro/src/lib.rs
+5 −2 crates/cargo-test-support/src/lib.rs
+3 −0 crates/resolver-tests/src/lib.rs
+1 −1 crates/resolver-tests/tests/resolve.rs
+0 −1 src/bin/cargo/cli.rs
+2 −5 src/bin/cargo/commands/doc.rs
+4 −18 src/bin/cargo/commands/install.rs
+0 −1 src/bin/cargo/main.rs
+4 −0 src/cargo/core/compiler/context/compilation_files.rs
+8 −0 src/cargo/core/compiler/context/mod.rs
+9 −3 src/cargo/core/compiler/custom_build.rs
+5 −1 src/cargo/core/compiler/fingerprint.rs
+27 −0 src/cargo/core/compiler/output_depinfo.rs
+0 −2 src/cargo/core/features.rs
+2 −2 src/cargo/core/profiles.rs
+31 −6 src/cargo/core/resolver/encode.rs
+1 −1 src/cargo/core/resolver/mod.rs
+70 −30 src/cargo/core/resolver/resolve.rs
+1 −0 src/cargo/lib.rs
+19 −3 src/cargo/ops/cargo_compile.rs
+24 −4 src/cargo/ops/cargo_output_metadata.rs
+1 −0 src/cargo/ops/cargo_package.rs
+42 −88 src/cargo/ops/common_for_install_and_uninstall.rs
+2 −2 src/cargo/ops/lockfile.rs
+11 −4 src/cargo/ops/registry.rs
+1 −0 src/cargo/util/command_prelude.rs
+2 −2 src/cargo/util/config/de.rs
+1 −1 src/cargo/util/config/key.rs
+5 −0 src/cargo/util/flock.rs
+2 −1 src/cargo/util/machine_message.rs
+2 −2 src/cargo/util/network.rs
+40 −7 src/doc/man/cargo-install.adoc
+22 −8 src/doc/man/cargo-metadata.adoc
+3 −1 src/doc/man/generated/cargo-bench.html
+3 −1 src/doc/man/generated/cargo-build.html
+3 −1 src/doc/man/generated/cargo-check.html
+3 −1 src/doc/man/generated/cargo-doc.html
+3 −1 src/doc/man/generated/cargo-fix.html
+60 −6 src/doc/man/generated/cargo-install.html
+22 −8 src/doc/man/generated/cargo-metadata.html
+3 −1 src/doc/man/generated/cargo-run.html
+3 −1 src/doc/man/generated/cargo-rustc.html
+3 −1 src/doc/man/generated/cargo-rustdoc.html
+3 −1 src/doc/man/generated/cargo-test.html
+3 −1 src/doc/man/options-message-format.adoc
+180 −49 src/doc/src/reference/external-tools.md
+17 −6 src/doc/src/reference/registries.md
+4 −8 src/doc/src/reference/specifying-dependencies.md
+0 −32 src/doc/src/reference/unstable.md
+6 −3 src/etc/man/cargo-bench.1
+4 −1 src/etc/man/cargo-build.1
+4 −1 src/etc/man/cargo-check.1
+4 −1 src/etc/man/cargo-doc.1
+4 −1 src/etc/man/cargo-fix.1
+108 −9 src/etc/man/cargo-install.1
+22 −8 src/etc/man/cargo-metadata.1
+6 −3 src/etc/man/cargo-run.1
+4 −1 src/etc/man/cargo-rustc.1
+4 −1 src/etc/man/cargo-rustdoc.1
+4 −1 src/etc/man/cargo-test.1
+18 −1 tests/build-std/main.rs
+2 −1 tests/testsuite/build.rs
+17 −3 tests/testsuite/cache_messages.rs
+2 −14 tests/testsuite/concurrent.rs
+105 −0 tests/testsuite/doc.rs
+6 −40 tests/testsuite/install.rs
+61 −162 tests/testsuite/install_upgrade.rs
+44 −41 tests/testsuite/lockfile_compat.rs
+2 −0 tests/testsuite/main.rs
+1 −0 tests/testsuite/metabuild.rs
+215 −15 tests/testsuite/metadata.rs
+11 −0 tests/testsuite/new.rs
+1 −1 tests/testsuite/publish.rs
+1 −1 tests/testsuite/resolve.rs
+7 −1 tests/testsuite/update.rs
2 changes: 1 addition & 1 deletion src/tools/rls
Submodule rls updated from 5db91c to 9ec2b8
1 change: 1 addition & 0 deletions src/tools/tidy/src/deps.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ const EXCEPTIONS: &[&str] = &[
"utf8parse", // Apache-2.0 OR MIT, cargo via strip-ansi-escapes
"vte", // Apache-2.0 OR MIT, cargo via strip-ansi-escapes
"sized-chunks", // MPL-2.0+, cargo via im-rc
"bitmaps", // MPL-2.0+, cargo via im-rc
// FIXME: this dependency violates the documentation comment above:
"fortanix-sgx-abi", // MPL-2.0+, libstd but only for `sgx` target
"dunce", // CC0-1.0 mdbook-linkcheck
Expand Down

0 comments on commit 2b98532

Please sign in to comment.