diff options
| author | bors <bors@rust-lang.org> | 2019-11-17 07:45:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-11-17 07:45:00 +0000 |
| commit | 5966d9b4d987f3b3c4a270bc0b23ef5fadac51bb (patch) | |
| tree | 2e7c6f905ee86be2f323fa2f540dcff153a01ad5 | |
| parent | 8831d766ace89bc74714918a7d9fbd3ca5ec946a (diff) | |
| parent | e0f2f9d363a628d33c882e8a9d0ca1dbec8866cc (diff) | |
| download | rust-5966d9b4d987f3b3c4a270bc0b23ef5fadac51bb.tar.gz rust-5966d9b4d987f3b3c4a270bc0b23ef5fadac51bb.zip | |
Auto merge of #66336 - ehuss:update-cargo-books, r=Mark-Simulacrum
Update Cargo, books ## cargo 12 commits in 5da4b4d47963868d9878480197581ccbbdaece74..8280633db680dec5bfe1de25156d1a1d53e6d190 2019-10-28 21:53:41 +0000 to 2019-11-11 23:17:05 +0000 - Don't panic when parsing `/proc/stat` (rust-lang/cargo#7580) - Fix unused configuration key warning for a few keys under `build`. (rust-lang/cargo#7575) - Add back support for `BROWSER` envvar in `cargo doc --open`. (rust-lang/cargo#7576) - Only include "already existing ..." comment in gitignore on conflict (rust-lang/cargo#7570) - Add VS Code user dir to .gitignore (rust-lang/cargo#7578) - Added aliases to subcommand typo suggestions. (rust-lang/cargo#7486) - Use multiple requirement syntax consistently (rust-lang/cargo#7573) - Update verison to 0.42 (rust-lang/cargo#7568) - Expand documentation on build scripts. (rust-lang/cargo#7565) - Update crossbeam-utils requirement from 0.6 to 0.7 (rust-lang/cargo#7566) - don't download std-docs on CI (rust-lang/cargo#7513) - Change my-buddy to github-handle (rust-lang/cargo#7553) ## nomicon 2 commits in 5004ad30d69f93553ceef74439fea2159d1f769e..58e36e0e08dec5a379ac568827c058e25990d6cd 2019-10-12 19:52:40 +0200 to 2019-10-30 08:14:24 -0500 - remove references to the nursery - Add github action to replace Travis.yml (rust-lang-nursery/nomicon#172) ## reference 7 commits in 4b21b646669e0af49fae7cae301898dc4bfaa1f0..45558c464fb458affbcdcb34323946da45c8a117 2019-10-27 22:33:11 +0100 to 2019-11-08 14:47:35 +0100 - Audit code blocks. (rust-lang-nursery/reference#715) - Update coherence and orphan rules documentation to match RFC 2451 (rust-lang-nursery/reference#703) - Update organization name (rust-lang-nursery/reference#713) - State that no_implicit_prelude also applies to nested modules (rust-lang-nursery/reference#707) - expand Copy docs (rust-lang-nursery/reference#711) - github action doesn't use the nursery (rust-lang-nursery/reference#706) - Migrate to GitHub Actions. (rust-lang-nursery/reference#705) ## book 1 commits in 28fa3d15b0bc67ea5e79eeff2198e4277fc61baf..e79dd62aa63396714278d484d91d48826737f47f 2019-10-29 07:16:09 -0500 to 2019-10-30 07:33:12 -0500 - No need for an iterator here to fetch values (rust-lang/book#1957) ## rust-by-example 1 commits in f3197ddf2abab9abdbc029def8164f4a748b0d91..dcee312c66267eb5a2f6f1561354003950e29105 2019-10-29 10:17:40 -0300 to 2019-10-31 11:26:53 -0300 - refactor: simplify extracting Result from Option (rust-lang/rust-by-example#1283) ## edition-guide 2 commits in e58bc4ca104e890ac56af846877c874c432a64b5..f553fb26c60c4623ea88a1cfe731eafe0643ce34 2019-07-31 20:14:12 +0200 to 2019-10-30 08:27:42 -0500 - remove old references to the nursery - Port from Travis to GitHub Actions (rust-lang-nursery/edition-guide#192)
| -rw-r--r-- | Cargo.lock | 17 | ||||
| m--------- | src/doc/book | 0 | ||||
| m--------- | src/doc/edition-guide | 0 | ||||
| m--------- | src/doc/nomicon | 0 | ||||
| m--------- | src/doc/reference | 0 | ||||
| m--------- | src/doc/rust-by-example | 0 | ||||
| m--------- | src/tools/cargo | 0 |
7 files changed, 14 insertions, 3 deletions
diff --git a/Cargo.lock b/Cargo.lock index 2ecb38851e7..83b64a9df1f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -266,7 +266,7 @@ dependencies = [ [[package]] name = "cargo" -version = "0.41.0" +version = "0.42.0" dependencies = [ "atty", "bytesize", @@ -276,7 +276,7 @@ dependencies = [ "clap", "core-foundation", "crates-io", - "crossbeam-utils 0.6.5", + "crossbeam-utils 0.7.0", "crypto-hash", "curl", "curl-sys", @@ -665,7 +665,7 @@ checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" [[package]] name = "crates-io" -version = "0.29.0" +version = "0.30.0" dependencies = [ "curl", "failure", @@ -783,6 +783,17 @@ dependencies = [ ] [[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" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/src/doc/book b/src/doc/book -Subproject 28fa3d15b0bc67ea5e79eeff2198e4277fc61ba +Subproject e79dd62aa63396714278d484d91d48826737f47 diff --git a/src/doc/edition-guide b/src/doc/edition-guide -Subproject e58bc4ca104e890ac56af846877c874c432a64b +Subproject f553fb26c60c4623ea88a1cfe731eafe0643ce3 diff --git a/src/doc/nomicon b/src/doc/nomicon -Subproject 5004ad30d69f93553ceef74439fea2159d1f769 +Subproject 58e36e0e08dec5a379ac568827c058e25990d6c diff --git a/src/doc/reference b/src/doc/reference -Subproject 4b21b646669e0af49fae7cae301898dc4bfaa1f +Subproject 45558c464fb458affbcdcb34323946da45c8a11 diff --git a/src/doc/rust-by-example b/src/doc/rust-by-example -Subproject f3197ddf2abab9abdbc029def8164f4a748b0d9 +Subproject dcee312c66267eb5a2f6f1561354003950e2910 diff --git a/src/tools/cargo b/src/tools/cargo -Subproject 5da4b4d47963868d9878480197581ccbbdaece7 +Subproject 8280633db680dec5bfe1de25156d1a1d53e6d19 |
