diff options
| author | bors <bors@rust-lang.org> | 2018-11-21 15:56:32 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-11-21 15:56:32 +0000 |
| commit | 910ec6d97ff03549c22352d7763be02b60d73470 (patch) | |
| tree | 998378180d691dfcf2b2f69a317e3515351b4566 /src/libstd/primitive_docs.rs | |
| parent | ee7bb94044bbdc1689cd29fcc585dd7d49a2672e (diff) | |
| parent | d7b3f5c6aeedf07c6a0ea4d5a79a106642488e0d (diff) | |
| download | rust-910ec6d97ff03549c22352d7763be02b60d73470.tar.gz rust-910ec6d97ff03549c22352d7763be02b60d73470.zip | |
Auto merge of #56118 - steveklabnik:update-books, r=alexcrichton
Update books for Rust 2018
This PR:
1. updates all of the books
* I don't know if @Gankro has further plans for the nomicon or not
2. updates the build process because TRPL is only distributing one edition now
3. fixes up the stdlib links
I think that this passes but it's 3:20 am and so I'm sending it in and will fix up anything i missed in the morning.
/cc @alexcrichton for the big beta backport
Diffstat (limited to 'src/libstd/primitive_docs.rs')
| -rw-r--r-- | src/libstd/primitive_docs.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libstd/primitive_docs.rs b/src/libstd/primitive_docs.rs index c2a16122a0d..48acc1096a6 100644 --- a/src/libstd/primitive_docs.rs +++ b/src/libstd/primitive_docs.rs @@ -22,7 +22,7 @@ /// `bool` implements various traits, such as [`BitAnd`], [`BitOr`], [`Not`], etc., /// which allow us to perform boolean operations using `&`, `|` and `!`. /// -/// [`if`] always demands a `bool` value. [`assert!`], being an important macro in testing, +/// `if` always demands a `bool` value. [`assert!`], being an important macro in testing, /// checks whether an expression returns `true`. /// /// ``` @@ -31,7 +31,6 @@ /// ``` /// /// [`assert!`]: macro.assert.html -/// [`if`]: ../book/first-edition/if.html /// [`BitAnd`]: ops/trait.BitAnd.html /// [`BitOr`]: ops/trait.BitOr.html /// [`Not`]: ops/trait.Not.html @@ -695,7 +694,7 @@ mod prim_str { } /// assert_eq!(tuple.2, 'c'); /// ``` /// -/// For more about tuples, see [the book](../book/first-edition/primitive-types.html#tuples). +/// For more about tuples, see [the book](../book/ch03-02-data-types.html#the-tuple-type). /// /// # Trait implementations /// |