Update cargo, books

[ehuss]

cargo

5 commits in b6581d383ed596b133e330011658c6f83cf85c2f..6be12653dcefb46ee7b605f063ee75b5e6cba513
2019-04-16 16:02:11 +0000 to 2019-04-19 15:05:03 +0000

• Improved docs for maintenance options (Improved docs for maintenance options cargo#6863)
• publish-lockfile: Various updates (publish-lockfile: Various updates cargo#6840)
• Treat HTTP/2 stream errors as spurious network errors. (Treat HTTP/2 stream errors as spurious network errors. cargo#6861)
• Validate registry token before operations that require it. (Validate registry token before operations that require it. cargo#6854)
• Cleanups wrt DYLD_FALLBACK_LIBRARY_PATH handling (Cleanups wrt DYLD_FALLBACK_LIBRARY_PATH handling cargo#6856)

reference

2 commits in 98f90ff..2a2de9c
2019-04-06 09:29:08 -0700 to 2019-04-22 10:25:52 -0700

• Remove unused link references. (Remove unused link references. reference#560)
• Fix attribute redirects. (Fix attribute redirects. reference#562)

book

22 commits in b93ec30bbc7b1b5c2f44223249ab359bed2ed5a6..db919bc6bb9071566e9c4f05053672133eaac33e
2019-03-26 16:54:10 -0400 to 2019-04-15 20:11:03 -0400

• Link to chapters mentioned in chapter 12
• Split up a long sentence
• Unclear wording 4.3 (Unclear wording 4.3 book#1907)
• Corrected error for array out of bounds (Corrected error for array out of bounds book#1900)
• Make lifetime explanation clearer (Make lifetime explanation clearer book#1901)
• Replace T: 'a + Messenger with T: Messenger (Replace T: 'a + Messenger with T: Messenger book#1831)
• Update range so matches rust-fmt . (Update range so matches rust-fmt . book#1890)
• Adding trailing comma (Adding trailing comma book#1891)
• point 2018 book redirects to existing pages instead of index (point 2018 book redirects to existing pages instead of index book#1919)
• Update ch04-03-slices.md (Update ch04-03-slices.md book#1921)
• Update link for Russian translation. (Update link for Russian translation. book#1915)
• Ch7 layout (Ch7 layout book#1917)
• Update the version of mdbook we use in-tree to match rust-lang/rust (Update the version of mdbook we use in-tree to match rust-lang/rust book#1912)
• Fix spellingz
• Update listings in ch 19-6 for nostarch
• Add a high-level overview of the changes in this version of the book
• Fix Travis CI badge url (Fix Travis CI badge url book#1893)
• Redo listing numbers in chapter 19 after removals
• Remove Advanced Lifetimes section completely
• Merge branch 'gh1780'
• Merge remote-tracking branch 'origin/master' into gh1567
• remove lifetime subtyping

rust-by-example

4 commits in f68ef3d0f4959f6a7d92a08d9994b117f0f4d32d..1ff0f8e018838a710ebc0cc1a7bf74ebe73ad9f1
2019-03-12 15:32:12 -0300 to 2019-04-15 08:15:32 -0300

• Fix borrow so it fails in 2018 edition Fixes 2018 borrow checker rust-by-example#1141 (Fix borrow so it fails in 2018 edition Fixes #1141 rust-by-example#1152)
• Replace lvalue and rvalue with place and value (Replace lvalue and rvalue with place and value rust-by-example#1160)
• Mutate array in iter_mut() example (Mutate array in iter_mut() example rust-by-example#1165)
• Fix a typo ("half" -> "halve") (Fix a typo ("half" -> "halve") rust-by-example#1172)

rustc-guide

8 commits in 464cb5b..99e1b1d
2019-03-23 18:39:14 -0500 to 2019-04-20 09:57:54 -0500

• Update BodyId description
• Update test-implementation chapter to current code
• update chalk with new organization
• move to subsection
• fix MovePathIndex link
• Update query chapter for the query macro rewrite
• subchapter with information about --error-format json
• Update query-evaluation-model-in-detail.md

edition-guide

1 commits in b56ddb11548450a6df4edd1ed571b2bc304eb9e6..c413d42a207bd082f801ec0137c31b71e4bfed4c
2019-03-10 10:23:16 +0100 to 2019-04-22 01:14:56 +0200

• fix command (fix command edition-guide#155)

embedded-book

1 commits in 7989c723607ef5b13b57208022259e6c771e11d0..de3d55f521e657863df45260ebbca1b10527f662
2019-04-04 12:14:37 +0000 to 2019-04-22 12:58:28 +0000

• Minor fixes (Minor fixes rust-embedded/book#185)

nomicon

6 commits in c02e0e7754a76886e55b976a3a4fac20100cd35d..fb29b147be4d9a1f8e24aba753a7e1de537abf61
2019-03-25 16:52:56 -0400 to 2019-04-22 19:10:29 -0400

• Fix link to copy_nonoverlapping (Fix link to copy_nonoverlapping nomicon#134)
• Various unchecked-uninit improvements (Various unchecked-uninit improvements nomicon#130)
• OOM behaviour in vec-alloc.md (OOM behaviour in vec-alloc.md nomicon#133)
• Added missing "things". (Added missing "things". nomicon#131)
• Fix number agreement in subtyping chapter (Fix number agreement in subtyping chapter nomicon#128)
• Minor improvements (Minor improvements nomicon#129)

[rust-highfive]

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

[rust-highfive]

⚠️ Warning ⚠️

• These commits modify submodules.

[ehuss]

r? @alexcrichton

[alexcrichton]

@bors: r+ delegate+

[bors]

✌️ @ehuss can now approve this pull request

[bors]

📌 Commit 0ef384a571573f757a151fdf4b4403c0f34ddd44 has been approved by alexcrichton

[ehuss]

Added nomicon
@bors r=alexcrichton

[bors]

📌 Commit ac8e397 has been approved by alexcrichton

[Centril]

r0llup planning, @bors p=1

[bors]

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

1. git checkout update-cargo-books (switch to your branch)
2. git fetch upstream master (retrieve the latest master)
3. git rebase upstream/master -p (rebase on top of it)
4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
5. git push self update-cargo-books --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

[ehuss]

@bors r=alexcrichton

[bors]

📌 Commit bd1c33f has been approved by alexcrichton

[bors]

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

1. git checkout update-cargo-books (switch to your branch)
2. git fetch upstream master (retrieve the latest master)
3. git rebase upstream/master -p (rebase on top of it)
4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
5. git push self update-cargo-books --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

[ehuss]

@bors r=alexcrichton

[bors]

📌 Commit 882352a has been approved by alexcrichton

[bors]

⌛ Testing commit 882352a with merge e305df1...

[bors]

☀️ Test successful - checks-travis, status-appveyor
Approved by: alexcrichton
Pushing e305df1 to master...