Skip to content

Commit

Permalink
Auto merge of rust-lang#65941 - ehuss:update-cargo-books, r=alexcrichton
Browse files Browse the repository at this point in the history
Update cargo, books.

## cargo

8 commits in 3ba5f27170db10af7a92f2b682e049397197b8fa..5da4b4d47963868d9878480197581ccbbdaece74
2019-10-22 15:05:18 +0000 to 2019-10-28 21:53:41 +0000
- Add --filter-platform to `cargo metadata`. (rust-lang/cargo#7376)
- Fix `cargo fix` not showing colors. (rust-lang/cargo#7550)
- Rephrase --manifest-path section (rust-lang/cargo#7409)
- Add a note to discourage the use of -Zminimal-versions. (rust-lang/cargo#7549)
- Fix profile override warning in a workspace. (rust-lang/cargo#7536)
- Fix some tests failing on Windows nightly. (rust-lang/cargo#7534)
- Show better error message for Windows abnormal termination. (rust-lang/cargo#7535)
- Run `apt update` before `apt install` (rust-lang/cargo#7541)

## reference

8 commits in 5b9d2fc..4b21b64
2019-10-03 22:39:10 +0200 to 2019-10-27 22:33:11 +0100
- Document `const_constructor` feature (rust-lang/reference#677)
- Add `non_exhaustive` to reference. (rust-lang/reference#609)
- Re-add rust-docs component for lintcheck (rust-lang/reference#702)
- group signed and unsigned integers in layout table (rust-lang/reference#700)
- Fix layout table rendering (rust-lang/reference#699)
- Add reference for attributes in function parameters (rust-lang/reference#657)
- Update now that proc macros can expand to macro_rules. (rust-lang/reference#694)
- Fix match in union example. (rust-lang/reference#684)

## book

8 commits in 9bb8b161963fcebc9d9ccd732ba26f42108016d5..28fa3d15b0bc67ea5e79eeff2198e4277fc61baf
2019-10-14 18:42:55 -0500 to 2019-10-29 07:16:09 -0500
- Update Ch19.1 on slice splitting (rust-lang/book#1999)
- fixed inconsistent terminology regarding enums (rust-lang/book#2022)
- Update ch15-03 code to match output. (rust-lang/book#2020)
- Fixes rust-lang/book#2039 (rust-lang/book#2040)
- Update ch15-03-drop.md (rust-lang/book#2049)
- unit type value is also a value (rust-lang/book#2061)
- Minor: remove an extraneous `.` (rust-lang/book#2059)
- Clarifications and consistent use of quotation marks (rust-lang/book#1992)

## rust-by-example

4 commits in 0b111eaae36cc4b4997684be853882a59e2c7ca7..f3197ddf2abab9abdbc029def8164f4a748b0d91
2019-10-14 18:34:25 -0300 to 2019-10-29 10:17:40 -0300
- Fix typos (rust-lang/rust-by-example#1285)
- Improve Cargo / Dependencies section (rust-lang/rust-by-example#1287)
- Improve Cargo / Build Scripts section (rust-lang/rust-by-example#1288)
- Make if_let exercise runnable (rust-lang/rust-by-example#1289)
  • Loading branch information
bors committed Oct 30, 2019
2 parents 0b7e28a + 33591a7 commit c553e8e
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/doc/reference
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 62 files
+1 −1 ci/azure-test-all.yml
+8 −0 src/bin/cargo/commands/metadata.rs
+13 −9 src/bin/cargo/commands/test.rs
+2 −2 src/cargo/core/compiler/mod.rs
+1 −1 src/cargo/core/compiler/standard_lib.rs
+11 −16 src/cargo/core/profiles.rs
+17 −14 src/cargo/ops/cargo_compile.rs
+3 −4 src/cargo/ops/cargo_doc.rs
+3 −3 src/cargo/ops/cargo_install.rs
+135 −81 src/cargo/ops/cargo_output_metadata.rs
+9 −5 src/cargo/ops/cargo_package.rs
+7 −0 src/cargo/ops/fix.rs
+21 −3 src/cargo/ops/resolve.rs
+11 −0 src/cargo/util/errors.rs
+11 −0 src/doc/man/cargo-metadata.adoc
+2 −2 src/doc/man/generated/cargo-bench.html
+2 −2 src/doc/man/generated/cargo-build.html
+2 −2 src/doc/man/generated/cargo-check.html
+2 −2 src/doc/man/generated/cargo-clean.html
+2 −2 src/doc/man/generated/cargo-doc.html
+2 −2 src/doc/man/generated/cargo-fetch.html
+2 −2 src/doc/man/generated/cargo-fix.html
+2 −2 src/doc/man/generated/cargo-generate-lockfile.html
+2 −2 src/doc/man/generated/cargo-locate-project.html
+20 −2 src/doc/man/generated/cargo-metadata.html
+2 −2 src/doc/man/generated/cargo-package.html
+2 −2 src/doc/man/generated/cargo-pkgid.html
+2 −2 src/doc/man/generated/cargo-publish.html
+2 −2 src/doc/man/generated/cargo-run.html
+2 −2 src/doc/man/generated/cargo-rustc.html
+2 −2 src/doc/man/generated/cargo-rustdoc.html
+2 −2 src/doc/man/generated/cargo-test.html
+2 −2 src/doc/man/generated/cargo-update.html
+2 −2 src/doc/man/generated/cargo-vendor.html
+2 −2 src/doc/man/generated/cargo-verify-project.html
+2 −2 src/doc/man/options-manifest-path.adoc
+6 −0 src/doc/src/reference/unstable.md
+4 −4 src/etc/man/cargo-bench.1
+4 −4 src/etc/man/cargo-build.1
+4 −4 src/etc/man/cargo-check.1
+5 −5 src/etc/man/cargo-clean.1
+4 −4 src/etc/man/cargo-doc.1
+5 −5 src/etc/man/cargo-fetch.1
+4 −4 src/etc/man/cargo-fix.1
+5 −5 src/etc/man/cargo-generate-lockfile.1
+5 −5 src/etc/man/cargo-locate-project.1
+23 −5 src/etc/man/cargo-metadata.1
+4 −4 src/etc/man/cargo-package.1
+5 −5 src/etc/man/cargo-pkgid.1
+5 −5 src/etc/man/cargo-publish.1
+5 −5 src/etc/man/cargo-run.1
+5 −5 src/etc/man/cargo-rustc.1
+5 −5 src/etc/man/cargo-rustdoc.1
+4 −4 src/etc/man/cargo-test.1
+5 −5 src/etc/man/cargo-update.1
+4 −4 src/etc/man/cargo-vendor.1
+5 −5 src/etc/man/cargo-verify-project.1
+2 −2 tests/testsuite/dep_info.rs
+19 −0 tests/testsuite/fix.rs
+627 −10 tests/testsuite/metadata.rs
+32 −0 tests/testsuite/profile_overrides.rs
+12 −18 tests/testsuite/test.rs

0 comments on commit c553e8e

Please sign in to comment.