Skip to content

Commit

Permalink
Auto merge of #56615 - integer32llc:update-book, r=GuillaumeGomez
Browse files Browse the repository at this point in the history
Update the book to fix some edition-related bugs

I'd love to have this included in a point release if one happens, but the changes aren't worth doing a point release on their own IMO. I'd definitely like to see this backported to beta.

The most urgent changes included here are:

- Chapter 19.6, on macros (including the macro changes that just stabilized), [is cut off](rust-lang/book#1668) because of an ill-placed newline in a comment that [pulldown-cmark interprets incorrectly](pulldown-cmark/pulldown-cmark#124).
- [The `Cargo.toml` shown in the Guessing Game example in Chapter 2 (and one in Chapter 14) doesn't have `edition="2018"`](rust-lang/book#1671), which can be confusing depending on whether the readers have it in theirs or not, think they should remove it if they have it, and the rest of the chapter assumes it's there and the code doesn't compile if you don't have it.
- The redirects implemented as part of only shipping the 2018 edition of the book sometimes lead to [having to click through 2 redirect pages](rust-lang/book#1667) when it could be just one.

There are other small corrections included that were made since the last time the book was updated, but those aren't urgent.

cc @steveklabnik
  • Loading branch information
bors committed Dec 8, 2018
2 parents 8db2342 + 9d75198 commit d7a9d96
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/doc/book
Submodule book updated 67 files
+1 −1 redirects/attributes.md
+2 −2 redirects/bibliography.md
+2 −2 redirects/borrow-and-asref.md
+3 −3 redirects/casting-between-types.md
+3 −3 redirects/choosing-your-guarantees.md
+3 −3 redirects/closures.md
+3 −3 redirects/comments.md
+3 −3 redirects/concurrency.md
+2 −2 redirects/conditional-compilation.md
+5 −5 redirects/crates-and-modules.md
+3 −3 redirects/deref-coercions.md
+3 −3 redirects/drop.md
+2 −2 redirects/effective-rust.md
+3 −3 redirects/enums.md
+3 −3 redirects/error-handling.md
+3 −3 redirects/functions.md
+3 −3 redirects/generics.md
+3 −3 redirects/getting-started.md
+2 −2 redirects/glossary.md
+3 −3 redirects/guessing-game.md
+3 −4 redirects/if-let.md
+3 −3 redirects/iterators.md
+5 −5 redirects/lifetimes.md
+3 −3 redirects/macros.md
+5 −5 redirects/match.md
+3 −3 redirects/method-syntax.md
+3 −3 redirects/mutability.md
+3 −3 redirects/ownership.md
+3 −3 redirects/primitive-types.md
+5 −5 redirects/procedural-macros.md
+3 −3 redirects/references-and-borrowing.md
+3 −3 redirects/release-channels.md
+2 −2 redirects/structs.md
+7 −7 redirects/syntax-and-semantics.md
+5 −6 redirects/syntax-index.md
+3 −3 redirects/testing.md
+3 −3 redirects/trait-objects.md
+5 −5 redirects/traits.md
+3 −3 redirects/unsafe.md
+1 −1 redirects/using-rust-without-the-standard-library.md
+3 −3 redirects/vectors.md
+1 −1 src/appendix-03-derivable-traits.md
+1 −1 src/ch00-00-introduction.md
+47 −32 src/ch02-00-guessing-game-tutorial.md
+13 −13 src/ch03-01-variables-and-mutability.md
+2 −2 src/ch03-02-data-types.md
+3 −5 src/ch03-03-how-functions-work.md
+3 −3 src/ch03-04-comments.md
+11 −11 src/ch03-05-control-flow.md
+15 −15 src/ch04-01-what-is-ownership.md
+8 −9 src/ch04-02-references-and-borrowing.md
+20 −15 src/ch04-03-slices.md
+10 −10 src/ch05-01-defining-structs.md
+11 −12 src/ch05-02-example-structs.md
+5 −5 src/ch05-03-method-syntax.md
+3 −3 src/ch06-01-defining-an-enum.md
+5 −5 src/ch06-02-match.md
+9 −9 src/ch06-03-if-let.md
+26 −36 src/ch08-01-vectors.md
+14 −14 src/ch08-02-strings.md
+24 −24 src/ch08-03-hash-maps.md
+12 −12 src/ch09-01-unrecoverable-errors-with-panic.md
+19 −21 src/ch09-02-recoverable-errors-with-result.md
+1 −0 src/ch14-02-publishing-to-crates-io.md
+5 −5 src/ch15-05-interior-mutability.md
+1 −1 src/ch18-03-pattern-syntax.md
+4 −6 src/ch19-06-macros.md

0 comments on commit d7a9d96

Please sign in to comment.