about summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorCorey Farwell <coreyf@rwell.org>2017-02-20 12:42:55 -0500
committerGitHub <noreply@github.com>2017-02-20 12:42:55 -0500
commit9a8dbbe918da20eb75b924ecc0742e42c70c3709 (patch)
treebe7ffac7211cbedf53d95320197a17ec97248a49 /src/libcore
parent7ef0192532dbaedd2496de89ae9ef37f4db65a06 (diff)
parent010a28de7cf767c1131b771b139b03a47c3fd418 (diff)
downloadrust-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/libcore')
-rw-r--r--src/libcore/mem.rs2
-rw-r--r--src/libcore/raw.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libcore/mem.rs b/src/libcore/mem.rs
index 5655fd06604..209107ef92c 100644
--- a/src/libcore/mem.rs
+++ b/src/libcore/mem.rs
@@ -525,7 +525,7 @@ pub fn replace<T>(dest: &mut T, mut src: T) -> T {
 /// it will not release any borrows, as borrows are based on lexical scope.
 ///
 /// This effectively does nothing for
-/// [types which implement `Copy`](../../book/ownership.html#Copy%20types),
+/// [types which implement `Copy`](../../book/ownership.html#copy-types),
 /// e.g. integers. Such values are copied and _then_ moved into the function,
 /// so the value persists after this function call.
 ///
diff --git a/src/libcore/raw.rs b/src/libcore/raw.rs
index 652b139f1e6..a7d0d3899b1 100644
--- a/src/libcore/raw.rs
+++ b/src/libcore/raw.rs
@@ -25,7 +25,7 @@
 /// Book][moreinfo] contains more details about the precise nature of
 /// these internals.
 ///
-/// [moreinfo]: ../../book/trait-objects.html#Representation
+/// [moreinfo]: ../../book/trait-objects.html#representation
 ///
 /// `TraitObject` is guaranteed to match layouts, but it is not the
 /// type of trait objects (e.g. the fields are not directly accessible