Auto merge of #46110 - steveklabnik:update-books, r=steveklabnik

Update books for next release Since I was out last week I didn't get this done as early as usual, I don't know if beta has branched already or not.
rust-lang · Nov 20, 2017 · 33374fa · 33374fa
2 parents e061383 + a3917b2
commit 33374fa
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/doc/book b/src/doc/book
diff --git a/src/doc/nomicon b/src/doc/nomicon
diff --git a/src/doc/reference b/src/doc/reference
diff --git a/src/libcore/ops/mod.rs b/src/libcore/ops/mod.rs
@@ -150,7 +150,7 @@
 //! [`Sub`]: trait.Sub.html
 //! [`Mul`]: trait.Mul.html
 //! [`clone`]: ../clone/trait.Clone.html#tymethod.clone
-//! [operator precedence]: ../../reference/expressions/operator-expr.html#operator-precedence
+//! [operator precedence]: ../../reference/expressions.html#expression-precedence
 
 #![stable(feature = "rust1", since = "1.0.0")]
+1 −1		.travis.yml
+6 −0		ci/build.sh
+2 −2		redirects/associated-types.md
+2 −2		redirects/choosing-your-guarantees.md
+2 −2		redirects/closures.md
+2 −2		redirects/comments.md
+2 −2		redirects/concurrency.md
+4 −2		redirects/const-and-static.md
+5 −2		redirects/crates-and-modules.md
+2 −2		redirects/deref-coercions.md
+2 −2		redirects/documentation.md
+2 −2		redirects/drop.md
+2 −2		redirects/enums.md
+2 −2		redirects/error-handling.md
+2 −2		redirects/ffi.md
+2 −2		redirects/functions.md
+3 −2		redirects/generics.md
+2 −2		redirects/getting-started.md
+2 −2		redirects/guessing-game.md
+2 −2		redirects/if-let.md
+2 −2		redirects/if.md
+2 −2		redirects/iterators.md
+5 −2		redirects/lifetimes.md
+2 −2		redirects/loops.md
+6 −2		redirects/match.md
+2 −2		redirects/method-syntax.md
+2 −2		redirects/mutability.md
+2 −2		redirects/operators-and-overloading.md
+2 −2		redirects/ownership.md
+5 −2		redirects/patterns.md
+2 −2		redirects/primitive-types.md
+1 −0		redirects/procedural-macros.md
+2 −2		redirects/raw-pointers.md
+2 −2		redirects/references-and-borrowing.md
+6 −2		redirects/strings.md
+2 −2		redirects/structs.md
+7 −2		redirects/syntax-and-semantics.md
+2 −2		redirects/testing.md
+2 −2		redirects/the-stack-and-the-heap.md
+2 −2		redirects/trait-objects.md
+5 −2		redirects/traits.md
+3 −2		redirects/type-aliases.md
+2 −2		redirects/ufcs.md
+2 −2		redirects/unsafe.md
+2 −2		redirects/unsized-types.md
+3 −2		redirects/vectors.md
+40 −40		second-edition/Cargo.lock
+1 −0		second-edition/dictionary.txt
+5 −5		second-edition/nostarch.sh
+35 −34		second-edition/nostarch/chapter03.md
+216 −218		second-edition/nostarch/chapter04.md
+39 −40		second-edition/nostarch/chapter05.md
+57 −70		second-edition/nostarch/chapter06.md
+100 −77		second-edition/nostarch/chapter07.md
+143 −135		second-edition/nostarch/chapter08.md
+35 −41		second-edition/nostarch/chapter09.md
+595 −548		second-edition/nostarch/chapter17.md
+837 −415		second-edition/nostarch/chapter18.md
+4 −5		second-edition/src/SUMMARY.md
+1 −1		second-edition/src/appendix-06-translation.md
+1 −1		second-edition/src/appendix-07-newest-features.md
+1 −1		second-edition/src/ch01-02-hello-world.md
+15 −14		second-edition/src/ch02-00-guessing-game-tutorial.md
+9 −9		second-edition/src/ch03-01-variables-and-mutability.md
+3 −2		second-edition/src/ch03-02-data-types.md
+7 −7		second-edition/src/ch03-03-how-functions-work.md
+16 −16		second-edition/src/ch03-05-control-flow.md
+58 −54		second-edition/src/ch04-01-what-is-ownership.md
+20 −14		second-edition/src/ch04-02-references-and-borrowing.md
+27 −23		second-edition/src/ch04-03-slices.md
+21 −20		second-edition/src/ch05-01-defining-structs.md
+14 −16		second-edition/src/ch05-02-example-structs.md
+9 −9		second-edition/src/ch06-01-defining-an-enum.md
+3 −3		second-edition/src/ch06-02-match.md
+32 −27		second-edition/src/ch07-01-mod-and-the-filesystem.md
+51 −35		second-edition/src/ch07-02-controlling-visibility-with-pub.md
+12 −12		second-edition/src/ch07-03-importing-names-with-use.md
+29 −27		second-edition/src/ch08-01-vectors.md
+52 −47		second-edition/src/ch08-02-strings.md
+19 −19		second-edition/src/ch08-03-hash-maps.md
+1 −1		second-edition/src/ch09-02-recoverable-errors-with-result.md
+7 −4		second-edition/src/ch11-01-writing-tests.md
+1 −1		second-edition/src/ch11-02-running-tests.md
+1 −0		second-edition/src/ch11-03-test-organization.md
+2 −2		second-edition/src/ch12-02-reading-a-file.md
+1 −1		second-edition/src/ch12-04-testing-the-librarys-functionality.md
+1 −1		second-edition/src/ch13-02-iterators.md
+2 −2		second-edition/src/ch15-02-deref.md
+6 −4		second-edition/src/ch16-02-message-passing.md
+6 −3		second-edition/src/ch17-00-oop.md
+98 −93		second-edition/src/ch17-01-what-is-oo.md
+189 −206		second-edition/src/ch17-02-trait-objects.md
+296 −241		second-edition/src/ch17-03-oo-design-patterns.md
+28 −13		second-edition/src/ch18-00-patterns.md
+166 −106		second-edition/src/ch18-01-all-the-places-for-patterns.md
+55 −48		second-edition/src/ch18-02-refutability.md
+609 −244		second-edition/src/ch18-03-pattern-syntax.md
+15 −15		second-edition/src/ch19-03-advanced-traits.md