From e0f2f9d363a628d33c882e8a9d0ca1dbec8866cc Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Tue, 12 Nov 2019 09:57:41 -0800 Subject: [PATCH] Update Cargo, books --- Cargo.lock | 17 ++++++++++++++--- src/doc/book | 2 +- src/doc/edition-guide | 2 +- src/doc/nomicon | 2 +- src/doc/reference | 2 +- src/doc/rust-by-example | 2 +- src/tools/cargo | 2 +- 7 files changed, 20 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 16f2ffc28150f..e84f39b3f59dc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -272,7 +272,7 @@ dependencies = [ [[package]] name = "cargo" -version = "0.41.0" +version = "0.42.0" dependencies = [ "atty", "bytesize", @@ -282,7 +282,7 @@ dependencies = [ "clap", "core-foundation", "crates-io", - "crossbeam-utils 0.6.5", + "crossbeam-utils 0.7.0", "crypto-hash", "curl", "curl-sys", @@ -619,7 +619,7 @@ checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" [[package]] name = "crates-io" -version = "0.29.0" +version = "0.30.0" dependencies = [ "curl", "failure", @@ -745,6 +745,17 @@ dependencies = [ "lazy_static 1.3.0", ] +[[package]] +name = "crossbeam-utils" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4" +dependencies = [ + "autocfg", + "cfg-if", + "lazy_static 1.3.0", +] + [[package]] name = "crypto-hash" version = "0.3.1" diff --git a/src/doc/book b/src/doc/book index 28fa3d15b0bc6..e79dd62aa6339 160000 --- a/src/doc/book +++ b/src/doc/book @@ -1 +1 @@ -Subproject commit 28fa3d15b0bc67ea5e79eeff2198e4277fc61baf +Subproject commit e79dd62aa63396714278d484d91d48826737f47f diff --git a/src/doc/edition-guide b/src/doc/edition-guide index e58bc4ca104e8..f553fb26c60c4 160000 --- a/src/doc/edition-guide +++ b/src/doc/edition-guide @@ -1 +1 @@ -Subproject commit e58bc4ca104e890ac56af846877c874c432a64b5 +Subproject commit f553fb26c60c4623ea88a1cfe731eafe0643ce34 diff --git a/src/doc/nomicon b/src/doc/nomicon index 5004ad30d69f9..58e36e0e08dec 160000 --- a/src/doc/nomicon +++ b/src/doc/nomicon @@ -1 +1 @@ -Subproject commit 5004ad30d69f93553ceef74439fea2159d1f769e +Subproject commit 58e36e0e08dec5a379ac568827c058e25990d6cd diff --git a/src/doc/reference b/src/doc/reference index 4b21b646669e0..45558c464fb45 160000 --- a/src/doc/reference +++ b/src/doc/reference @@ -1 +1 @@ -Subproject commit 4b21b646669e0af49fae7cae301898dc4bfaa1f0 +Subproject commit 45558c464fb458affbcdcb34323946da45c8a117 diff --git a/src/doc/rust-by-example b/src/doc/rust-by-example index f3197ddf2abab..dcee312c66267 160000 --- a/src/doc/rust-by-example +++ b/src/doc/rust-by-example @@ -1 +1 @@ -Subproject commit f3197ddf2abab9abdbc029def8164f4a748b0d91 +Subproject commit dcee312c66267eb5a2f6f1561354003950e29105 diff --git a/src/tools/cargo b/src/tools/cargo index 5da4b4d479638..8280633db680d 160000 --- a/src/tools/cargo +++ b/src/tools/cargo @@ -1 +1 @@ -Subproject commit 5da4b4d47963868d9878480197581ccbbdaece74 +Subproject commit 8280633db680dec5bfe1de25156d1a1d53e6d190