Skip to content

Commit

Permalink
Rollup merge of rust-lang#44980 - steveklabnik:update-books, r=estebank
Browse files Browse the repository at this point in the history
update books for next release

Also fixes some stdlib links to the reference which have changed.

First step in https://forge.rust-lang.org/release-process.html, doing it a few days early 😄
  • Loading branch information
kennytm committed Oct 5, 2017
2 parents b380254 + 851b6d4 commit 14d8055
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/doc/book
Submodule book updated 53 files
+1 −0 .travis.yml
+29 −0 second-edition/dictionary.txt
+111 −99 second-edition/nostarch/chapter05.md
+469 −360 second-edition/nostarch/chapter08.md
+413 −399 second-edition/nostarch/chapter09.md
+1,834 −764 second-edition/nostarch/chapter15.md
+ second-edition/nostarch/odt/chapter05.docx
+ second-edition/nostarch/odt/chapter08.docx
+ second-edition/nostarch/odt/chapter09.docx
+22 −22 second-edition/src/appendix-02-operators.md
+1 −1 second-edition/src/ch01-02-hello-world.md
+8 −12 second-edition/src/ch03-02-data-types.md
+4 −4 second-edition/src/ch05-00-structs.md
+57 −45 second-edition/src/ch05-01-defining-structs.md
+30 −30 second-edition/src/ch05-02-example-structs.md
+17 −17 second-edition/src/ch05-03-method-syntax.md
+1 −1 second-edition/src/ch06-01-defining-an-enum.md
+1 −1 second-edition/src/ch06-02-match.md
+1 −1 second-edition/src/ch07-01-mod-and-the-filesystem.md
+9 −9 second-edition/src/ch08-00-common-collections.md
+159 −103 second-edition/src/ch08-01-vectors.md
+192 −157 second-edition/src/ch08-02-strings.md
+117 −90 second-edition/src/ch08-03-hash-maps.md
+14 −13 second-edition/src/ch09-00-error-handling.md
+80 −69 second-edition/src/ch09-01-unrecoverable-errors-with-panic.md
+150 −119 second-edition/src/ch09-02-recoverable-errors-with-result.md
+94 −94 second-edition/src/ch09-03-to-panic-or-not-to-panic.md
+3 −3 second-edition/src/ch10-02-traits.md
+1 −1 second-edition/src/ch10-03-lifetime-syntax.md
+5 −6 second-edition/src/ch11-01-writing-tests.md
+1 −1 second-edition/src/ch11-02-running-tests.md
+1 −1 second-edition/src/ch12-04-testing-the-librarys-functionality.md
+1 −1 second-edition/src/ch12-06-writing-to-stderr-instead-of-stdout.md
+1 −1 second-edition/src/ch13-02-iterators.md
+1 −1 second-edition/src/ch13-04-performance.md
+87 −31 second-edition/src/ch15-00-smart-pointers.md
+233 −85 second-edition/src/ch15-01-box.md
+394 −143 second-edition/src/ch15-02-deref.md
+183 −88 second-edition/src/ch15-03-drop.md
+142 −89 second-edition/src/ch15-04-rc.md
+425 −161 second-edition/src/ch15-05-interior-mutability.md
+354 −185 second-edition/src/ch15-06-reference-cycles.md
+4 −4 second-edition/src/ch16-02-message-passing.md
+2 −2 second-edition/src/ch16-03-shared-state.md
+1 −1 second-edition/src/ch19-02-advanced-lifetimes.md
+253 −76 second-edition/src/ch19-03-advanced-traits.md
+7 −7 second-edition/src/ch19-04-advanced-types.md
+2 −2 second-edition/src/ch19-05-advanced-functions-and-closures.md
+1 −1 second-edition/src/ch20-01-single-threaded.md
+1 −1 second-edition/src/ch20-05-sending-requests-via-channels.md
+1 −1 second-edition/src/ch20-06-graceful-shutdown-and-cleanup.md
+56 −11 second-edition/theme/index.hbs
+1 −0 second-edition/tools/docx-to-md.xsl
2 changes: 1 addition & 1 deletion src/doc/nomicon
2 changes: 1 addition & 1 deletion src/doc/reference
4 changes: 2 additions & 2 deletions src/libcore/ops/deref.rs
Expand Up @@ -40,7 +40,7 @@
/// [book]: ../../book/second-edition/ch15-02-deref.html
/// [`DerefMut`]: trait.DerefMut.html
/// [more]: #more-on-deref-coercion
/// [ref-deref-op]: ../../reference/expressions.html#the-dereference-operator
/// [ref-deref-op]: ../../reference/expressions/operator-expr.html#the-dereference-operator
/// [ref-deref-trait]: ../../reference/the-deref-trait.html
/// [type coercions]: ../../reference/type-coercions.html
///
Expand Down Expand Up @@ -127,7 +127,7 @@ impl<'a, T: ?Sized> Deref for &'a mut T {
/// [book]: ../../book/second-edition/ch15-02-deref.html
/// [`Deref`]: trait.Deref.html
/// [more]: #more-on-deref-coercion
/// [ref-deref-op]: ../../reference/expressions.html#the-dereference-operator
/// [ref-deref-op]: ../../reference/expressions/operator-expr.html#the-dereference-operator
/// [ref-deref-trait]: ../../reference/the-deref-trait.html
/// [type coercions]: ../../reference/type-coercions.html
///
Expand Down
2 changes: 1 addition & 1 deletion src/libcore/ops/mod.rs
Expand Up @@ -150,7 +150,7 @@
//! [`Sub`]: trait.Sub.html
//! [`Mul`]: trait.Mul.html
//! [`clone`]: ../clone/trait.Clone.html#tymethod.clone
//! [operator precedence]: ../../reference/expressions.html#operator-precedence
//! [operator precedence]: ../../reference/expressions/operator-expr.html#operator-precedence

#![stable(feature = "rust1", since = "1.0.0")]

Expand Down

0 comments on commit 14d8055

Please sign in to comment.