Skip to content

Commit

Permalink
Auto merge of #66336 - ehuss:update-cargo-books, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
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/nomicon#172)

## reference

7 commits in 4b21b64..45558c4
2019-10-27 22:33:11 +0100 to 2019-11-08 14:47:35 +0100
- Audit code blocks. (rust-lang/reference#715)
- Update coherence and orphan rules documentation to match RFC 2451 (rust-lang/reference#703)
- Update organization name (rust-lang/reference#713)
- State that no_implicit_prelude also applies to nested modules (rust-lang/reference#707)
- expand Copy docs (rust-lang/reference#711)
- github action doesn't use the nursery (rust-lang/reference#706)
- Migrate to GitHub Actions. (rust-lang/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/edition-guide#192)
  • Loading branch information
bors committed Nov 17, 2019
2 parents 8831d76 + e0f2f9d commit 5966d9b
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 9 deletions.
17 changes: 14 additions & 3 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ dependencies = [

[[package]]
name = "cargo"
version = "0.41.0"
version = "0.42.0"
dependencies = [
"atty",
"bytesize",
Expand All @@ -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",
Expand Down Expand Up @@ -665,7 +665,7 @@ checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"

[[package]]
name = "crates-io"
version = "0.29.0"
version = "0.30.0"
dependencies = [
"curl",
"failure",
Expand Down Expand Up @@ -782,6 +782,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"
Expand Down
2 changes: 1 addition & 1 deletion src/doc/book
Submodule book updated 1 files
+1 −1 src/ch10-00-generics.md
2 changes: 1 addition & 1 deletion src/doc/edition-guide
2 changes: 1 addition & 1 deletion src/doc/nomicon
2 changes: 1 addition & 1 deletion src/doc/rust-by-example
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 43 files
+1 −0 .gitignore
+72 −2 CHANGELOG.md
+3 −3 Cargo.toml
+7 −6 ci/azure-install-rust.yml
+3 −3 crates/cargo-test-support/src/paths.rs
+1 −1 crates/crates-io/Cargo.toml
+16 −3 src/bin/cargo/main.rs
+3 −18 src/cargo/core/compiler/compilation.rs
+24 −2 src/cargo/ops/cargo_doc.rs
+8 −4 src/cargo/ops/cargo_new.rs
+1 −1 src/cargo/ops/fix.rs
+27 −37 src/cargo/util/config/mod.rs
+19 −19 src/cargo/util/cpu.rs
+3 −1 src/doc/man/cargo-doc.adoc
+3 −1 src/doc/man/cargo-rustdoc.adoc
+3 −1 src/doc/man/generated/cargo-doc.html
+3 −1 src/doc/man/generated/cargo-rustdoc.html
+1 −0 src/doc/src/SUMMARY.md
+505 −0 src/doc/src/reference/build-script-examples.md
+306 −480 src/doc/src/reference/build-scripts.md
+7 −0 src/doc/src/reference/config.md
+31 −2 src/doc/src/reference/environment-variables.md
+6 −1 src/doc/src/reference/manifest.md
+2 −2 src/doc/src/reference/publishing.md
+15 −15 src/doc/src/reference/specifying-dependencies.md
+5 −3 src/etc/man/cargo-doc.1
+3 −3 src/etc/man/cargo-help.1
+3 −3 src/etc/man/cargo-init.1
+3 −3 src/etc/man/cargo-install.1
+3 −3 src/etc/man/cargo-login.1
+3 −3 src/etc/man/cargo-new.1
+3 −3 src/etc/man/cargo-owner.1
+5 −3 src/etc/man/cargo-rustdoc.1
+3 −3 src/etc/man/cargo-search.1
+3 −3 src/etc/man/cargo-uninstall.1
+3 −3 src/etc/man/cargo-version.1
+3 −3 src/etc/man/cargo-yank.1
+2 −2 src/etc/man/cargo.1
+0 −5 tests/testsuite/build_script.rs
+43 −0 tests/testsuite/cargo_command.rs
+29 −2 tests/testsuite/init.rs
+0 −5 tests/testsuite/rustc_info_cache.rs
+1 −6 tests/testsuite/rustdoc.rs

0 comments on commit 5966d9b

Please sign in to comment.