Skip to content

Commit

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

Update nomicon, cargo, reference, book, rust-by-example, embedded-book

## nomicon

2 commits in 041c46e692a2592853aeca132c8dfe8eb5a79a9e..8be35b201f9cf0a4c3fcc96c83ac21671dcf3112
2019-11-20 16:46:45 +0100 to 2019-12-01 13:02:12 -0500
- Update unwinding.md
- ci: remove needless rust-docs component

## cargo

15 commits in 626f0f40efd32e6b3dbade50cd53fdfaa08446ba..5a139f7e6d67fd8a416a3f19d8e01581d24c0333
2019-12-03 16:53:04 +0000 to 2019-12-10 20:17:50 +0000
- Bump cargo-platform version. (rust-lang/cargo#7693)
- Add a test for `cargo locate-project` (rust-lang/cargo#7690)
- Emit error on [target.'cfg(debug_assertions)'.dependencies] and similar (rust-lang/cargo#7660)
- Update the layout of `Cargo Commands` in doc (rust-lang/cargo#7687)
- Features and dependencies can't have the same name (rust-lang/cargo#7682)
- Fix some typos in doc (rust-lang/cargo#7672)
- Add test for `NAME` environment variable when `cargo new` (rust-lang/cargo#7667)
- Add test for `GIT_COMMITTER_EMAIL` when `cargo new` (rust-lang/cargo#7666)
- document support for Bitbucket Pipelines badges (rust-lang/cargo#7663)
- Add cargo-vendor to the list of cargo commands in doc (rust-lang/cargo#7659)
- Fix typo in section 'Caching the Cargo home in CI' (rust-lang/cargo#7661)
- Docs: Add an appendix on git authentication. (rust-lang/cargo#7658)
- Remove --offline empty index error. (rust-lang/cargo#7655)
- Change the link destination of cargo book contribution (rust-lang/cargo#7657)
- Add a --offline hint. (rust-lang/cargo#7654)

## reference

2 commits in 9e843ae..787e8d8
2019-11-24 17:44:04 +0100 to 2019-12-10 10:01:29 -0800
- Update for visibility syntax changes. (rust-lang/reference#722)
- document `bind_by_move_pattern_guards` (rust-lang/reference#720)

## book

2 commits in 81ebaa2a3f88d4d106516c489682e64cacba4f60..ef8bb568035ded8ddfa30a9309026638cc3c8136
2019-11-15 08:30:04 -0800 to 2019-11-28 11:00:04 -0600
- Remove optional commas from match arms in ch18-03 (rust-lang/book#2176)
- Remove call_box() from ch20-03 (rust-lang/book#2177)

## rust-by-example

1 commits in 4835e025826729827a94fdeb7cb85fed288d08bb..b7ac1bc76b7d02a43c83b3a931d226f708aa1ff4
2019-11-14 09:20:43 -0300 to 2019-12-02 11:38:43 -0300
- Make TryFrom & TryInto example editable (rust-lang/rust-by-example#1297)

## embedded-book

1 commits in 5ca585c4a7552efb546e7681c3de0712f4ae4fdc..c26234930282210849256e4ecab925f0f2daf3be
2019-08-27 13:39:14 +0000 to 2019-12-07 17:25:11 +0000
- Fix `impl Gpio` -> `impl GpioConfig`  (rust-embedded/book#216)
  • Loading branch information
@bors
bors committed Dec 21, 2019
2 parents 0a440b1 + 5141c48 commit fc5deca
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ dependencies = [

[[package]]
name = "cargo-platform"
version = "0.1.0"
version = "0.1.1"
dependencies = [
"serde",
]
Expand Down
2 changes: 1 addition & 1 deletion src/doc/book
Submodule book updated 2 files
+2 −2 src/ch18-03-pattern-syntax.md
+1 −1 src/ch20-03-graceful-shutdown-and-cleanup.md
2 changes: 1 addition & 1 deletion src/doc/embedded-book
Submodule embedded-book updated 2 files
+1 −1 src/static-guarantees/design-contracts.md
+1 −1 src/static-guarantees/state-machines.md
2 changes: 1 addition & 1 deletion src/doc/nomicon
Submodule nomicon updated 2 files
+2 −2 .github/workflows/main.yml
+1 −1 src/unwinding.md
2 changes: 1 addition & 1 deletion src/doc/rust-by-example
Submodule rust-by-example updated 1 files
+1 −1 src/conversion/try_from_try_into.md
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 59 files
+1 −1 Cargo.toml
+1 −1 crates/cargo-platform/Cargo.toml
+42 −0 crates/cargo-platform/src/lib.rs
+73 −0 crates/cargo-platform/tests/test_cfg.rs
+2 −2 src/bin/cargo/commands/vendor.rs
+6 −5 src/cargo/core/compiler/compilation.rs
+5 −31 src/cargo/core/compiler/context/mod.rs
+1 −1 src/cargo/core/compiler/fingerprint.rs
+0 −18 src/cargo/core/compiler/job_queue.rs
+0 −36 src/cargo/core/compiler/layout.rs
+54 −43 src/cargo/core/compiler/mod.rs
+1 −33 src/cargo/core/compiler/standard_lib.rs
+4 −0 src/cargo/core/compiler/unit_dependencies.rs
+1 −1 src/cargo/core/resolver/conflict_cache.rs
+1 −1 src/cargo/core/resolver/context.rs
+1 −1 src/cargo/core/resolver/dep_cache.rs
+1 −1 src/cargo/core/resolver/errors.rs
+2 −2 src/cargo/core/resolver/mod.rs
+1 −2 src/cargo/ops/cargo_doc.rs
+1 −1 src/cargo/ops/cargo_package.rs
+8 −6 src/cargo/ops/cargo_test.rs
+3 −2 src/cargo/ops/lockfile.rs
+24 −4 src/cargo/sources/path.rs
+1 −1 src/cargo/sources/registry/mod.rs
+0 −12 src/cargo/sources/registry/remote.rs
+1 −1 src/cargo/util/lockserver.rs
+5 −1 src/cargo/util/toml/mod.rs
+3 −0 src/doc/man/cargo.adoc
+4 −0 src/doc/man/generated/cargo.html
+33 −31 src/doc/src/SUMMARY.md
+56 −0 src/doc/src/appendix/git-authentication.md
+11 −0 src/doc/src/commands/build-commands.md
+3 −0 src/doc/src/commands/cargo.md
+3 −0 src/doc/src/commands/general-commands.md
+6 −3 src/doc/src/commands/index.md
+7 −0 src/doc/src/commands/manifest-commands.md
+5 −0 src/doc/src/commands/package-commands.md
+5 −0 src/doc/src/commands/publishing-commands.md
+1 −1 src/doc/src/guide/cargo-home.md
+1 −1 src/doc/src/guide/creating-a-new-project.md
+1 −1 src/doc/src/index.md
+1 −1 src/doc/src/reference/build-scripts.md
+3 −1 src/doc/src/reference/config.md
+2 −2 src/doc/src/reference/environment-variables.md
+55 −39 src/doc/src/reference/manifest.md
+1 −1 src/doc/src/reference/profiles.md
+9 −0 src/doc/src/reference/specifying-dependencies.md
+7 −2 src/etc/man/cargo.1
+0 −30 tests/testsuite/bad_config.rs
+37 −0 tests/testsuite/build.rs
+16 −0 tests/testsuite/locate_project.rs
+1 −0 tests/testsuite/lockfile_compat.rs
+1 −0 tests/testsuite/main.rs
+22 −4 tests/testsuite/new.rs
+40 −17 tests/testsuite/offline.rs
+28 −3 tests/testsuite/package.rs
+1 −1 tests/testsuite/publish.rs
+9 −3 tests/testsuite/standard_lib.rs
+1 −1 tests/testsuite/tool_paths.rs

0 comments on commit fc5deca

Please sign in to comment.