Skip to content

Commit

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

## nomicon

1 commits in 358e6a61d5f4f0496d0a81e70cdcd25d05307342..c6b4bf831e9a40aec34f53067d20634839a6778b
2021-10-20 11:23:12 -0700 to 2021-11-09 02:30:56 +0900
- Replace some use of variant with covariant (rust-lang/nomicon#322)

## book

11 commits in fd9299792852c9a368cb236748781852f75cdac6..5c5dbc5b196c9564422b3193264f3288d2a051ce
2021-10-22 21:59:46 -0400 to 2021-11-09 19:30:43 -0500
- Fix constants link.
- Fix updated anchor
- Propagate edits to chapter 2 back
- Edits to nostarch's chapter 3 edits
- ch 3 from nostarch
- Fix Cargo.toml snippet about custom derive macros
- Snapshot of chapter 9 for nostarch
- Create tmp/src for converting quotes, not sure why this broke but ok
- Update question mark to better explain where it can be used
- Clarify sentence about Results in functions that don't return Result. Fixes rust-lang/book#2912.
- Merge pull request rust-lang/book#2913 from covariant/patch-1

## rust-by-example

2 commits in 27f1ff5e440ef78828b68ab882b98e1b10d9af32..e9d45342d7a6c1def4731f1782d87ea317ba30c3
2021-10-13 08:04:40 -0300 to 2021-11-02 13:33:03 -0500
- Enums: Linked-List Needs Re-Wording (rust-lang/rust-by-example#1469)
- fix: Use the point as top left corner for `square` (rust-lang/rust-by-example#1471)

## rustc-dev-guide

13 commits in b06008731af0f7d07cd0614e820c8276dfed1c18..196ef69aa68f2cef44f37566ee7db37daf00301b
2021-10-21 15:13:09 -0500 to 2021-11-07 07:48:47 -0600
- Fix typo: [upv.rs_mentioned] -> [upvars_mentioned]
- Add note to emphasize replacing TARGET_TRIPLE (rust-lang/rustc-dev-guide#1250)
- Remove some legacy test suites.
- tiny capitalization fix
- Fix date
- Update some date-check comments
- Ensure date-check cron job is using latest stable Rust
- enhance subtree docs, link to clippy docs
- Edit introduction to bootstrapping
- Some minor adjustments to the diagnostic documentation
- Edit "About this guide" for semantic line feeds
- Fix `rustc_mir` related links (rust-lang/rustc-dev-guide#1228)
- Add documentation for LLVM CFI support

## edition-guide

3 commits in 7c0088ca744d293a5f4b1e2ac378e7c23d30fe55..27f4a84d3852e9416cae5861254fa53a825c56bd
2021-10-05 13:28:05 +0200 to 2021-11-08 10:13:20 -0500
- Add a missing period (rust-lang/edition-guide#271)
- Fix syntax error in code example (rust-lang/edition-guide#270)
- Fixed an example error of prelude.md (rust-lang/edition-guide#269)
  • Loading branch information
matthiaskrgr committed Nov 10, 2021
2 parents ebd1529 + 9be22db commit e737501
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion library/std/src/keyword_docs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ mod break_keyword {}
/// T` and `*mut T`. More about `const` as used in raw pointers can be read at the Rust docs for the [pointer primitive].
///
/// [pointer primitive]: pointer
/// [Rust Book]: ../book/ch03-01-variables-and-mutability.html#differences-between-variables-and-constants
/// [Rust Book]: ../book/ch03-01-variables-and-mutability.html#constants
/// [Reference]: ../reference/items/constant-items.html
/// [const-eval]: ../reference/const_eval.html
mod const_keyword {}
Expand Down
2 changes: 1 addition & 1 deletion src/doc/book
Submodule book updated 31 files
+1 −78 listings/ch09-error-handling/listing-09-10/Cargo.lock
+1 −2 listings/ch09-error-handling/listing-09-10/Cargo.toml
+0 −0 listings/ch09-error-handling/listing-09-10/output.txt
+2 −52 listings/ch09-error-handling/listing-09-10/src/main.rs
+2 −1 listings/ch09-error-handling/listing-09-11/Cargo.lock
+0 −0 listings/ch09-error-handling/listing-09-11/Cargo.toml
+15 −0 listings/ch09-error-handling/listing-09-11/src/main.rs
+0 −0 listings/ch09-error-handling/listing-09-12/Cargo.lock
+0 −0 listings/ch09-error-handling/listing-09-12/Cargo.toml
+0 −0 listings/ch09-error-handling/listing-09-12/src/main.rs
+83 −0 listings/ch09-error-handling/listing-09-13/Cargo.lock
+7 −0 listings/ch09-error-handling/listing-09-13/Cargo.toml
+55 −0 listings/ch09-error-handling/listing-09-13/src/main.rs
+0 −5 listings/ch09-error-handling/no-listing-06-question-mark-in-main/src/main.rs
+228 −218 nostarch/chapter03.md
+1,042 −0 nostarch/chapter09.md
+1 −1 redirects/const-and-static.md
+20 −18 src/ch02-00-guessing-game-tutorial.md
+58 −65 src/ch03-01-variables-and-mutability.md
+58 −60 src/ch03-02-data-types.md
+34 −35 src/ch03-03-how-functions-work.md
+3 −3 src/ch03-04-comments.md
+63 −66 src/ch03-05-control-flow.md
+103 −26 src/ch09-02-recoverable-errors-with-result.md
+3 −3 src/ch09-03-to-panic-or-not-to-panic.md
+1 −1 src/ch11-01-writing-tests.md
+1 −1 src/ch12-03-improving-error-handling-and-modularity.md
+1 −1 src/ch17-03-oo-design-patterns.md
+1 −1 src/ch19-01-unsafe-rust.md
+1 −1 src/ch19-06-macros.md
+1 −1 tools/convert-quotes.sh
2 changes: 1 addition & 1 deletion src/doc/edition-guide
2 changes: 1 addition & 1 deletion src/doc/nomicon
2 changes: 1 addition & 1 deletion src/doc/rust-by-example

0 comments on commit e737501

Please sign in to comment.