Skip to content

Commit

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

## reference

2 commits in 361367c126290ac17cb4089f8d38fd8b2ac43f98..3b6fe80c205d2a2b5dc8a276192bbce9eeb9e9cf
2021-02-15 09:58:13 -0800 to 2021-02-22 22:09:17 -0800
- Add an extra fn() entry to the variance table in the subtyping chapter (rust-lang/reference#874)
- Turbofish: Explain what the example is of. (rust-lang/reference#966)

## book

28 commits in db5e8a5105aa22979490dce30e33b68d8645761d..0f87daf683ae3de3cb725faecb11b7e7e89f0e5a
2021-02-12 16:58:20 -0500 to 2021-03-01 08:54:04 -0500
- Ohhh the should_panic was for mdbook test. Oops
- Fix bad regex in the update rustc script and regenerate broken output
- Clarify that we only mentioned unwrap_or_else, but haven't explained it
- Add ferris to some listings that don't compile. Fixes rust-lang/book#2598
- Remove fancy quote from a code comment
- Panic now points at our code, not stdlib slice code
- Disable playground on thread::sleep examples
- Disable playground button on listings in ch 12 that use CLI args
- Reword ambiguous sentence. Fixes rust-lang/book#2317.
- Rename shoes_in_my_size to shoes_in_size to be a better example
- Fix visible "ANCHOR: here" in listing 13-21 (rust-lang/book#2628)
- minor clarification about deriving Copy and Clone (rust-lang/book#2627)
- Clarify relationship of trait to mock object
- Fix "message" that should be "method"
- Fix rust-lang/book#2625 (rust-lang/book#2626)
- fix misleading hash claim (rust-lang/book#2621)
- Make link syntax consistent and word wrap
- Added hyperlinks to Appendices
- Use console syntax highlighting in some more places
- Merge remote-tracking branch 'origin/pr/2615'
- Fix broken blockquote
- Update one more bit of output caught by the update rust script
- Update and clarify some text affected by the rand update
- Update lock files and output
- Update error output for changes to chapter 10 listings
- Merge remote-tracking branch 'origin/pr/2542'
- Tweak wording in for loop explanation
- Merge remote-tracking branch 'origin/pr/2460'

## rust-by-example

1 commits in 551cc4bc8394feccea6acd21f86d9a4e1d2271a0..3e0d98790c9126517fa1c604dc3678f396e92a27
2021-02-03 17:12:37 -0300 to 2021-02-25 08:23:10 -0300
- Make flow_control/for/.into_iter() example run (rust-lang/rust-by-example#1415)

## rustc-dev-guide

530 commits in 7adfab4..c431f8c
2020-04-08 08:52:05 +0200 to 2021-02-28 16:35:20 -0500

... Many updates.

## embedded-book

1 commits in 4cf7981696a85c3e633076c6401611bd3f6346c4..a96d096cffe5fa2c84af1b4b61e1492f839bb2e1
2021-02-11 10:55:22 +0000 to 2021-02-17 08:08:52 +0000
- Add note about using more recent openocd interface file. Closes rust-embedded/book#277 and rust-embedded/book#263  (rust-embedded/book#284)
  • Loading branch information
JohnTitor authored Mar 2, 2021
2 parents 738cacf + b840304 commit 97f9b18
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 74 files
+41 −45 listings/ch02-guessing-game-tutorial/listing-02-02/Cargo.lock
+1 −1 listings/ch02-guessing-game-tutorial/listing-02-02/Cargo.toml
+41 −45 listings/ch02-guessing-game-tutorial/listing-02-03/Cargo.lock
+1 −1 listings/ch02-guessing-game-tutorial/listing-02-03/Cargo.toml
+1 −1 listings/ch02-guessing-game-tutorial/listing-02-03/src/main.rs
+41 −45 listings/ch02-guessing-game-tutorial/listing-02-04/Cargo.lock
+1 −1 listings/ch02-guessing-game-tutorial/listing-02-04/Cargo.toml
+7 −4 listings/ch02-guessing-game-tutorial/listing-02-04/output.txt
+1 −1 listings/ch02-guessing-game-tutorial/listing-02-04/src/main.rs
+41 −45 listings/ch02-guessing-game-tutorial/listing-02-05/Cargo.lock
+1 −1 listings/ch02-guessing-game-tutorial/listing-02-05/Cargo.toml
+1 −1 listings/ch02-guessing-game-tutorial/listing-02-05/src/main.rs
+41 −45 listings/ch02-guessing-game-tutorial/listing-02-06/Cargo.lock
+1 −1 listings/ch02-guessing-game-tutorial/listing-02-06/Cargo.toml
+1 −1 listings/ch02-guessing-game-tutorial/listing-02-06/src/main.rs
+41 −45 listings/ch02-guessing-game-tutorial/no-listing-03-convert-string-to-number/Cargo.lock
+1 −1 listings/ch02-guessing-game-tutorial/no-listing-03-convert-string-to-number/Cargo.toml
+1 −1 listings/ch02-guessing-game-tutorial/no-listing-03-convert-string-to-number/src/main.rs
+41 −45 listings/ch02-guessing-game-tutorial/no-listing-04-looping/Cargo.lock
+1 −1 listings/ch02-guessing-game-tutorial/no-listing-04-looping/Cargo.toml
+1 −1 listings/ch02-guessing-game-tutorial/no-listing-04-looping/src/main.rs
+41 −45 listings/ch02-guessing-game-tutorial/no-listing-05-quitting/Cargo.lock
+1 −1 listings/ch02-guessing-game-tutorial/no-listing-05-quitting/Cargo.toml
+1 −1 listings/ch02-guessing-game-tutorial/no-listing-05-quitting/src/main.rs
+1 −1 listings/ch04-understanding-ownership/listing-04-03/src/main.rs
+41 −45 listings/ch07-managing-growing-projects/listing-07-18/Cargo.lock
+1 −1 listings/ch07-managing-growing-projects/listing-07-18/Cargo.toml
+1 −1 listings/ch07-managing-growing-projects/listing-07-18/src/main.rs
+41 −45 listings/ch07-managing-growing-projects/no-listing-01-use-std-unnested/Cargo.lock
+1 −1 listings/ch07-managing-growing-projects/no-listing-01-use-std-unnested/Cargo.toml
+1 −1 listings/ch07-managing-growing-projects/no-listing-01-use-std-unnested/src/main.rs
+41 −45 listings/ch09-error-handling/listing-09-10/Cargo.lock
+1 −1 listings/ch09-error-handling/listing-09-10/Cargo.toml
+1 −1 listings/ch09-error-handling/listing-09-10/src/main.rs
+41 −45 listings/ch09-error-handling/no-listing-09-guess-out-of-range/Cargo.lock
+1 −1 listings/ch09-error-handling/no-listing-09-guess-out-of-range/Cargo.toml
+1 −1 listings/ch09-error-handling/no-listing-09-guess-out-of-range/src/main.rs
+5 −5 listings/ch10-generic-types-traits-and-lifetimes/listing-10-03/src/main.rs
+8 −8 listings/ch10-generic-types-traits-and-lifetimes/listing-10-04/src/main.rs
+4 −4 listings/ch10-generic-types-traits-and-lifetimes/listing-10-05/output.txt
+3 −3 listings/ch10-generic-types-traits-and-lifetimes/listing-10-05/src/main.rs
+3 −3 listings/ch11-writing-automated-tests/listing-11-13/output.txt
+2 −2 listings/ch13-functional-features/listing-13-19/src/lib.rs
+40 −44 listings/ch14-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/Cargo.lock
+1 −1 listings/ch14-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/add-one/Cargo.toml
+40 −44 listings/ch14-more-about-cargo/output-only-03-use-rand/add/Cargo.lock
+1 −1 listings/ch14-more-about-cargo/output-only-03-use-rand/add/add-one/Cargo.toml
+2 −0 listings/ch15-smart-pointers/listing-15-21/output.txt
+5 −5 src/appendix-03-derivable-traits.md
+1 −1 src/ch01-02-hello-world.md
+44 −34 src/ch02-00-guessing-game-tutorial.md
+1 −1 src/ch03-05-control-flow.md
+4 −2 src/ch05-02-example-structs.md
+1 −1 src/ch05-03-method-syntax.md
+2 −2 src/ch08-03-hash-maps.md
+12 −16 src/ch09-01-unrecoverable-errors-with-panic.md
+1 −1 src/ch09-02-recoverable-errors-with-result.md
+7 −1 src/ch10-00-generics.md
+2 −2 src/ch10-01-syntax.md
+1 −1 src/ch10-02-traits.md
+1 −1 src/ch11-01-writing-tests.md
+1 −1 src/ch11-03-test-organization.md
+1 −1 src/ch12-01-accepting-command-line-arguments.md
+1 −1 src/ch12-02-reading-a-file.md
+3 −3 src/ch12-03-improving-error-handling-and-modularity.md
+2 −2 src/ch12-04-testing-the-librarys-functionality.md
+1 −1 src/ch12-06-writing-to-stderr-instead-of-stdout.md
+4 −4 src/ch13-02-iterators.md
+7 −7 src/ch14-03-cargo-workspaces.md
+10 −10 src/ch15-05-interior-mutability.md
+3 −3 src/ch16-02-message-passing.md
+1 −1 src/ch18-03-pattern-syntax.md
+6 −5 src/ch19-01-unsafe-rust.md
+1 −1 tools/update-rustc.sh
2 changes: 1 addition & 1 deletion src/doc/embedded-book
2 changes: 1 addition & 1 deletion src/doc/reference
2 changes: 1 addition & 1 deletion src/doc/rust-by-example
2 changes: 1 addition & 1 deletion src/doc/rustc-dev-guide
Submodule rustc-dev-guide updated 153 files

0 comments on commit 97f9b18

Please sign in to comment.