Skip to content

Commit

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

## nomicon

1 commits in 7a13537f96af4b9b8e3ea296d6e5c3c7ab72ce9f..f51734eb5566c826b471977747ea3d7d6915bbe9
2021-07-05 23:34:47 -0400 to 2021-07-23 18:24:35 +0900
- Add cloning example for dot operator behaviour (rust-lang/nomicon#292)

## reference

3 commits in 82d75cf423e4a7824fb36e73ccb18519d6900610..3b7be075af5d6e402a18efff672a8a265b4596fd
2021-07-15 06:49:08 -0700 to 2021-07-26 13:20:11 -0700
- Fix typos + grammar (rust-lang/reference#1037)
- Expand on Unicode identifiers. (rust-lang/reference#1022)
- Remove incorrect apostrophe (rust-lang/reference#1076)

## book

17 commits in eac55314210519238652f12b30fec9daea61f7fe..a07036f864b37896b31eb996cd7aedb489f69a1f
2021-07-19 11:08:01 -0400 to 2021-07-26 20:19:46 -0400
- Set expectations a bit more realistically
- Snapshot of chapter 4 for nostarch
- A few small wording tweaks in ch 4
- Clarify that it's not stack/heap exactly that matters for copy/non copy, fixes rust-lang/book#2799
- Clarify a detail around move. Fixes rust-lang/book#2413.
- Clarify places that changed because of NLL. Fixes rust-lang/book#1939.
- nostarch ch3
- Small edits to chapter 3
-  (rust-lang/book#2797)
- Update ch03-03-how-functions-work.md: Pervasive -> Prevalent. (rust-lang/book#2796)
- Address loop labels and continue. Fixes rust-lang/book#1392.
- Clarify behavior of integer division. Fixes rust-lang/book#2248.
- Demonstrate how scope interacts with shadowing
- Add another cross-reference to the new unit type introduction
- Introduce the unit type with tuples. Fixes rust-lang/book#1933.
- Reword sentence to not have numbers separated only by a comma
- Link directly to other installation page. Fixes rust-lang/book#1609

## rust-by-example

1 commits in 1db6bb483cc87ad3b424d9aba764fe622960a1be..0dc9cd4e89f00cb5230f120e1a083916386e422b
2021-07-15 06:17:42 -0300 to 2021-07-23 09:14:27 -0300
- Grammatical mistake: Comparison as ... as the (rust-lang/rust-by-example#1453)

## rustc-dev-guide

2 commits in 93422c21baca585dc88357ec886a48f6ddc7d665..09343d6f921d2a07c66f8c41ec3d65bf1fa52556
2021-07-13 12:45:58 -0400 to 2021-07-26 00:37:28 +0200
- Fix typo in building/bootstrapping.md (rust-lang/rustc-dev-guide#1175)
- Link directly to stabilization report comments (rust-lang/rustc-dev-guide#1173)

## edition-guide

4 commits in af696ce8ea526445590ae0ca66a8128d2a95a69a..3710b0cae783d0bcd2b42452a63b081473f5970a
2021-07-20 11:38:03 -0400 to 2021-07-26 11:34:46 -0700
- Add more consistent headings and add a migration section to reserving-syntax (rust-lang/edition-guide#263)
- reserving-syntax.md: Expand and add detail (rust-lang/edition-guide#249)
- Fix typo in or-patterns section (rust-lang/edition-guide#262)
- Fix typo (rust-lang/edition-guide#261)
  • Loading branch information
@JohnTitor
JohnTitor committed Jul 27, 2021
2 parents bea8af9 + 07727c8 commit af6c95f
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/doc/book
Submodule book updated 39 files
+13 −0 .github/ISSUE_TEMPLATE/bug_report.md
+7 −0 .github/ISSUE_TEMPLATE/new_translation.md
+2 −2 .github/workflows/main.yml
+13 −7 CONTRIBUTING.md
+12 −0 README.md
+1 −1 listings/ch03-common-programming-concepts/listing-03-05/src/main.rs
+1 −1 listings/ch03-common-programming-concepts/no-listing-01-variables-are-immutable/output.txt
+2 −1 listings/ch03-common-programming-concepts/no-listing-03-shadowing/output.txt
+4 −1 listings/ch03-common-programming-concepts/no-listing-03-shadowing/src/main.rs
+1 −0 listings/ch03-common-programming-concepts/no-listing-07-numeric-operations/src/main.rs
+1 −2 listings/ch03-common-programming-concepts/no-listing-18-functions-with-multiple-parameters/output.txt
+3 −4 listings/ch03-common-programming-concepts/no-listing-18-functions-with-multiple-parameters/src/main.rs
+5 −0 listings/ch03-common-programming-concepts/no-listing-32-5-loop-labels/Cargo.lock
+6 −0 listings/ch03-common-programming-concepts/no-listing-32-5-loop-labels/Cargo.toml
+12 −0 listings/ch03-common-programming-concepts/no-listing-32-5-loop-labels/output.txt
+21 −0 listings/ch03-common-programming-concepts/no-listing-32-5-loop-labels/src/main.rs
+4 −4 listings/ch04-understanding-ownership/listing-04-04/src/main.rs
+2 −2 listings/ch04-understanding-ownership/listing-04-09/src/main.rs
+1 −1 listings/ch11-writing-automated-tests/no-listing-11-ignore-a-test/output.txt
+1 −1 listings/ch12-an-io-project/listing-12-16/output.txt
+2 −2 listings/ch12-an-io-project/listing-12-19/output.txt
+2 −2 listings/ch12-an-io-project/listing-12-21/output.txt
+1 −1 listings/ch13-functional-features/no-listing-01-failing-cacher-test/output.txt
+1 −1 listings/ch15-smart-pointers/listing-15-23/output.txt
+1,659 −0 nostarch/chapter03.md
+1,314 −0 nostarch/chapter04.md
+1 −1 rust-toolchain
+4 −2 src/ch01-01-installation.md
+1 −1 src/ch03-00-common-programming-concepts.md
+32 −22 src/ch03-01-variables-and-mutability.md
+24 −15 src/ch03-02-data-types.md
+12 −12 src/ch03-03-how-functions-work.md
+29 −6 src/ch03-05-control-flow.md
+19 −16 src/ch04-01-what-is-ownership.md
+32 −19 src/ch04-02-references-and-borrowing.md
+10 −7 src/ch04-03-slices.md
+13 −9 src/ch05-01-defining-structs.md
+6 −5 src/ch06-02-match.md
+1 −1 src/title-page.md
2 changes: 1 addition & 1 deletion src/doc/edition-guide
Submodule edition-guide updated 5 files
+2 −2 src/rust-2021/IntoIterator-for-arrays.md
+12 −1 src/rust-2021/disjoint-capture-in-closures.md
+2 −2 src/rust-2021/or-patterns-macro-rules.md
+1 −1 src/rust-2021/prelude.md
+60 −20 src/rust-2021/reserving-syntax.md
2 changes: 1 addition & 1 deletion src/doc/nomicon
Submodule nomicon updated 1 files
+128 −3 src/dot-operator.md
2 changes: 1 addition & 1 deletion src/doc/reference
Submodule reference updated 17 files
+4 −3 src/destructors.md
+1 −1 src/dynamically-sized-types.md
+2 −2 src/expressions.md
+1 −1 src/expressions/loop-expr.md
+1 −1 src/expressions/method-call-expr.md
+1 −1 src/glossary.md
+46 −16 src/identifiers.md
+1 −1 src/items/extern-crates.md
+1 −1 src/items/external-blocks.md
+1 −1 src/items/functions.md
+3 −3 src/items/implementations.md
+1 −1 src/items/modules.md
+1 −1 src/lifetime-elision.md
+1 −1 src/names/preludes.md
+1 −1 src/types/closure.md
+5 −6 src/types/slice.md
+1 −1 src/types/tuple.md
2 changes: 1 addition & 1 deletion src/doc/rust-by-example
Submodule rust-by-example updated 1 files
+1 −1 src/conversion/string.md
2 changes: 1 addition & 1 deletion src/doc/rustc-dev-guide
Submodule rustc-dev-guide updated 2 files
+1 −1 src/building/bootstrapping.md
+9 −3 src/stabilization_guide.md

0 comments on commit af6c95f

Please sign in to comment.