Skip to content

Commit

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

## nomicon

1 commits in 9c73283775466d22208a0b28afcab44db4c0cc10..05532356e7a4dbea2330aabb77611f5179493bb8
2022-09-30 07:31:22 +0900 to 2022-11-05 08:13:14 +0900
- Fix typos and grammatical errors (rust-lang/nomicon#384)

## reference

1 commits in 4ea7c5def38ac81df33a9e48e5637a82a5ac404d..9f0cc13ffcd27c1fbe1ab766a9491e15ddcf4d19
2022-10-25 15:14:36 -0700 to 2022-10-31 04:09:16 -0700
- Add a comma (rust-lang/reference#1289)

## book

12 commits in aa5ee485bd6bd80d205da7c82fcdd776f92fdd51..3f64052c048c6def93b94a2b514ee88bba918744
2022-10-20 16:49:55 -0400 to 2022-11-03 22:13:58 -0400
- Upgrade to Rust 1.65
- Upgrade to Rust 1.64
- Upgrade to Rust 1.63
- New ideas for the issue template to try
- Clarify that the conditional expression is the one under discussion
- Updates from copyedit of ch6
- Made Option<T> error explanation more clear
- Update ch06-01-defining-an-enum
- Upgrade mdbook
- Clarify that user1 can't be used as a whole instance. Fixes rust-lang/book#2978.
- Fix plural and incorrect phrase. Fixes rust-lang/book#3359.
- Updates from copyedit of ch5

## rust-by-example

4 commits in 03491f33375c5a2a1661c7fa4be671fe95ce1249..2b15c0abf2bada6e00553814336bc3e2d8399097
2022-10-21 07:30:08 -0300 to 2022-10-31 08:30:13 -0300
- Remove --edition from src/crates/using_lib.md (rust-lang/rust-by-example#1635)
- upgrade upload-artifact
- Clarify Fn in fn/closures/input_parameters.md (rust-lang/rust-by-example#1634)
- fix: erroneous white spaces in types/cast.md

## rustc-dev-guide

12 commits in 51a37ad19a15709d0601afbac6581f5aea6a45da..d0dc6c97a6486f68bac782fff135086eae6d77ec
2022-10-25 10:18:58 -0700 to 2022-11-07 16:49:22 +0200
- trans -> codegen
- Remove implementation details
- Update some more things and improve wording
- Update query.md
- replace tabs with spaces (rust-lang/rustc-dev-guide#1504)
- align code blocks with their paragraphs
- Fixes some typos (rust-lang/rustc-dev-guide#1502)
- UPDATE - mention of Diagnostic derive on enums
- trans -> codegen (rust-lang/rustc-dev-guide#1500)
- add note for err annotation formatting
- Remove `--bless` from pre-push hook suggestion
- Update for highfive transition.
  • Loading branch information
Manishearth authored Nov 9, 2022
2 parents a709cc1 + ef40824 commit 656f56c
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/doc/book
Submodule book updated 56 files
+6 −2 .github/ISSUE_TEMPLATE/bug_report.md
+4 −4 .github/workflows/main.yml
+4 −1 listings/ch02-guessing-game-tutorial/listing-02-04/output.txt
+8 −2 listings/ch03-common-programming-concepts/no-listing-19-statements-vs-expressions/output.txt
+6 −1 listings/ch03-common-programming-concepts/output-only-01-no-type-annotations/output.txt
+2 −2 listings/ch04-understanding-ownership/no-listing-04-cant-use-after-move/output.txt
+1 −1 listings/ch04-understanding-ownership/no-listing-10-multiple-mut-not-allowed/output.txt
+1 −1 listings/ch04-understanding-ownership/no-listing-12-immutable-and-mutable-not-allowed/output.txt
+1 −1 listings/ch04-understanding-ownership/no-listing-14-dangling-reference/output.txt
+2 −2 listings/ch04-understanding-ownership/no-listing-19-slice-error/output.txt
+2 −2 listings/ch05-using-structs-to-structure-related-data/listing-05-02/src/main.rs
+2 −2 listings/ch05-using-structs-to-structure-related-data/listing-05-03/src/main.rs
+2 −2 listings/ch05-using-structs-to-structure-related-data/listing-05-04/src/main.rs
+2 −2 listings/ch05-using-structs-to-structure-related-data/listing-05-05/src/main.rs
+1 −1 listings/ch05-using-structs-to-structure-related-data/listing-05-11/output.txt
+1 −1 listings/ch05-using-structs-to-structure-related-data/output-only-01-debug/output.txt
+10 −10 listings/ch06-enums-and-pattern-matching/no-listing-10-non-exhaustive-match/output.txt
+4 −4 listings/ch08-common-collections/listing-08-06/output.txt
+1 −1 listings/ch08-common-collections/output-only-01-not-char-boundary/output.txt
+4 −5 listings/ch09-error-handling/listing-09-10/output.txt
+1 −1 listings/ch10-generic-types-traits-and-lifetimes/listing-10-16/output.txt
+1 −1 listings/ch11-writing-automated-tests/listing-11-03/output.txt
+1 −1 listings/ch11-writing-automated-tests/listing-11-10/output.txt
+1 −1 listings/ch11-writing-automated-tests/no-listing-03-introducing-a-bug/output.txt
+1 −1 listings/ch11-writing-automated-tests/no-listing-04-bug-in-add-two/output.txt
+1 −1 listings/ch11-writing-automated-tests/no-listing-06-greeter-with-bug/output.txt
+1 −1 listings/ch11-writing-automated-tests/no-listing-07-custom-failure-message/output.txt
+1 −1 listings/ch11-writing-automated-tests/no-listing-08-guess-with-bug/output.txt
+1 −1 listings/ch11-writing-automated-tests/no-listing-09-guess-with-panic-msg-bug/output.txt
+1 −1 listings/ch11-writing-automated-tests/output-only-01-show-output/output.txt
+1 −1 listings/ch12-an-io-project/listing-12-16/output.txt
+10 −3 listings/ch13-functional-features/listing-13-03/output.txt
+7 −10 listings/ch13-functional-features/listing-13-08/output.txt
+2 −12 listings/ch15-smart-pointers/listing-15-03/output.txt
+1 −1 listings/ch15-smart-pointers/listing-15-23/output.txt
+1 −1 listings/ch16-fearless-concurrency/listing-16-09/output.txt
+20 −14 listings/ch16-fearless-concurrency/listing-16-14/output.txt
+1 −1 listings/ch16-fearless-concurrency/output-only-01-move-drop/output.txt
+1 −1 listings/ch17-oop/listing-17-10/output.txt
+11 −11 listings/ch18-patterns-and-matching/listing-18-08/output.txt
+4 −6 listings/ch18-patterns-and-matching/listing-18-15/src/main.rs
+3 −3 listings/ch18-patterns-and-matching/listing-18-16/src/main.rs
+10 −4 listings/ch19-advanced-features/listing-19-20/output.txt
+1 −1 listings/ch19-advanced-features/no-listing-18-returns-closure/output.txt
+7 −7 listings/ch20-web-server/listing-20-22/output.txt
+6 −0 listings/ch20-web-server/no-listing-04-update-worker-definition/output.txt
+1 −1 rust-toolchain
+1 −1 src/ch05-00-structs.md
+48 −28 src/ch05-01-defining-structs.md
+17 −17 src/ch05-02-example-structs.md
+56 −46 src/ch05-03-method-syntax.md
+2 −2 src/ch06-00-enums.md
+29 −29 src/ch06-01-defining-an-enum.md
+41 −39 src/ch06-02-match.md
+8 −6 src/ch06-03-if-let.md
+1 −1 src/title-page.md
2 changes: 1 addition & 1 deletion src/doc/nomicon
2 changes: 1 addition & 1 deletion src/doc/reference

0 comments on commit 656f56c

Please sign in to comment.