diff options
| author | Corey Farwell <coreyf@rwell.org> | 2017-02-20 12:42:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-20 12:42:55 -0500 |
| commit | 9a8dbbe918da20eb75b924ecc0742e42c70c3709 (patch) | |
| tree | be7ffac7211cbedf53d95320197a17ec97248a49 /src/libstd | |
| parent | 7ef0192532dbaedd2496de89ae9ef37f4db65a06 (diff) | |
| parent | 010a28de7cf767c1131b771b139b03a47c3fd418 (diff) | |
| download | rust-9a8dbbe918da20eb75b924ecc0742e42c70c3709.tar.gz rust-9a8dbbe918da20eb75b924ecc0742e42c70c3709.zip | |
Rollup merge of #39976 - steveklabnik:reenable-book-linkchecker, r=frewsxcv
Reenable linkchecker for books In some senses, this is a revert of https://github.com/rust-lang/rust/pull/39633/commits/cacb3bc9c741a7d41a1085af850cd3ff852307f5#diff-b64563d143f859565c8357a28ef81101R212; we disabled linkchecker for the book because the links were added by JavaScript. Now, that's fixed upstream, and so we can re-enable the checker. This also involves two other fixes: we have to check for `name`s as well as `id`s for links, and the linking algorithm of mdBook changed to the same as rustdoc's, so we change some links back. ~~~This isn't quite ready yet; it's [depending on a PR of mine to mdBook](https://github.com/azerupi/mdBook/pull/209). After that's released, this should be the last of these kinds of shenanigans~~~ 😄 This is good to go 😄
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/lib.rs | 4 | ||||
| -rw-r--r-- | src/libstd/primitive_docs.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 88c2310a86e..070690773b6 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -189,8 +189,8 @@ //! [`sync`]: sync/index.html //! [`thread`]: thread/index.html //! [`use std::env`]: env/index.html -//! [`use`]: ../book/crates-and-modules.html#Importing%20Modules%20with%20use -//! [crate root]: ../book/crates-and-modules.html#Basic%20terminology%3A%20Crates%20and%20Modules +//! [`use`]: ../book/crates-and-modules.html#importing-modules-with-use +//! [crate root]: ../book/crates-and-modules.html#basic-terminology-crates-and-modules //! [crates.io]: https://crates.io //! [deref coercions]: ../book/deref-coercions.html //! [files]: fs/struct.File.html diff --git a/src/libstd/primitive_docs.rs b/src/libstd/primitive_docs.rs index 1b3e17c300e..11197db98a3 100644 --- a/src/libstd/primitive_docs.rs +++ b/src/libstd/primitive_docs.rs @@ -490,7 +490,7 @@ mod prim_str { } /// assert_eq!(tuple.2, 'c'); /// ``` /// -/// For more about tuples, see [the book](../book/primitive-types.html#Tuples). +/// For more about tuples, see [the book](../book/primitive-types.html#tuples). /// /// # Trait implementations /// |