From 658253d30c124b67c964904400c4dc58a1b557b2 Mon Sep 17 00:00:00 2001 From: Oliver Middleton Date: Wed, 1 Jun 2016 13:32:58 +0100 Subject: [PATCH] Fix a few links in the book Links to directories and direct links to doc.rust-lang.org don't work properly when viewing the docs offline so fix them. --- src/doc/book/choosing-your-guarantees.md | 2 +- src/doc/book/documentation.md | 2 +- src/doc/book/error-handling.md | 2 +- src/doc/book/using-rust-without-the-standard-library.md | 9 +++++---- src/doc/book/vectors.md | 4 ++-- src/doc/nomicon/README.md | 2 +- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/doc/book/choosing-your-guarantees.md b/src/doc/book/choosing-your-guarantees.md index 50350213074..d88f619260a 100644 --- a/src/doc/book/choosing-your-guarantees.md +++ b/src/doc/book/choosing-your-guarantees.md @@ -232,7 +232,7 @@ indicator (one word in size) along with the data. At runtime each borrow causes a modification/check of the refcount. -[cell-mod]: ../std/cell/ +[cell-mod]: ../std/cell/index.html [cell]: ../std/cell/struct.Cell.html [refcell]: ../std/cell/struct.RefCell.html diff --git a/src/doc/book/documentation.md b/src/doc/book/documentation.md index 4a41bb7b7f3..3c6643fbfe1 100644 --- a/src/doc/book/documentation.md +++ b/src/doc/book/documentation.md @@ -76,7 +76,7 @@ This [unfortunate error](https://github.com/rust-lang/rust/issues/22547) is correct; documentation comments apply to the thing after them, and there's nothing after that last comment. -[rc-new]: https://doc.rust-lang.org/nightly/std/rc/struct.Rc.html#method.new +[rc-new]: ../std/rc/struct.Rc.html#method.new ### Writing documentation comments diff --git a/src/doc/book/error-handling.md b/src/doc/book/error-handling.md index c914c33a5a4..bca34187067 100644 --- a/src/doc/book/error-handling.md +++ b/src/doc/book/error-handling.md @@ -2205,7 +2205,7 @@ heuristics! [3]: ../std/option/enum.Option.html#method.unwrap_or [4]: ../std/option/enum.Option.html#method.unwrap_or_else [5]: ../std/option/enum.Option.html -[6]: ../std/result/ +[6]: ../std/result/index.html [7]: ../std/result/enum.Result.html#method.unwrap [8]: ../std/fmt/trait.Debug.html [9]: ../std/primitive.str.html#method.parse diff --git a/src/doc/book/using-rust-without-the-standard-library.md b/src/doc/book/using-rust-without-the-standard-library.md index 1179aebe54c..69958dd3e68 100644 --- a/src/doc/book/using-rust-without-the-standard-library.md +++ b/src/doc/book/using-rust-without-the-standard-library.md @@ -22,11 +22,12 @@ fn plus_one(x: i32) -> i32 { ``` Much of the functionality that’s exposed in the standard library is also -available via the [`core` crate](../core/). When we’re using the standard -library, Rust automatically brings `std` into scope, allowing you to use -its features without an explicit import. By the same token, when using +available via the [`core` crate](../core/index.html). When we’re using the +standard library, Rust automatically brings `std` into scope, allowing you to +use its features without an explicit import. By the same token, when using `#![no_std]`, Rust will bring `core` into scope for you, as well as [its -prelude](../core/prelude/v1/). This means that a lot of code will Just Work: +prelude](../core/prelude/v1/index.html). This means that a lot of code will Just +Work: ```rust #![no_std] diff --git a/src/doc/book/vectors.md b/src/doc/book/vectors.md index 1c44af2f21a..f3854b8ffdd 100644 --- a/src/doc/book/vectors.md +++ b/src/doc/book/vectors.md @@ -152,5 +152,5 @@ API documentation][vec]. [box]: ../std/boxed/index.html [generic]: generics.html [panic]: concurrency.html#panics -[get]: http://doc.rust-lang.org/std/vec/struct.Vec.html#method.get -[get_mut]: http://doc.rust-lang.org/std/vec/struct.Vec.html#method.get_mut +[get]: ../std/vec/struct.Vec.html#method.get +[get_mut]: ../std/vec/struct.Vec.html#method.get_mut diff --git a/src/doc/nomicon/README.md b/src/doc/nomicon/README.md index 4554652a17a..b2e1eac5e0d 100644 --- a/src/doc/nomicon/README.md +++ b/src/doc/nomicon/README.md @@ -35,4 +35,4 @@ exception-safety, pointer aliasing, memory models, and even some type-theory. We will also be spending a lot of time talking about the different kinds of safety and guarantees. -[trpl]: ../book/ +[trpl]: ../book/index.html