about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-02-21 23:46:20 +0000
committerbors <bors@rust-lang.org>2017-02-21 23:46:20 +0000
commitfc6f092c21a7a7249a9f8860f3cd10160aa36c02 (patch)
treeed9c0f76adb0b15d2c19af9b2aec212805f0c663 /src/libstd
parent0f34b532af590d25e9178f87c620931dd671cc2e (diff)
parent55c02f6bcc6b31ed018dfc5af7ede6cff1902f4d (diff)
downloadrust-fc6f092c21a7a7249a9f8860f3cd10160aa36c02.tar.gz
rust-fc6f092c21a7a7249a9f8860f3cd10160aa36c02.zip
Auto merge of #39855 - steveklabnik:mdbook-reference, r=GuillaumeGomez
Port the reference to mdbook

Part of #39588.

This is only a work in progress. Still left to do:

- [x] double check contents weren't duplicated/lost with the move to individual pages (I'm going to do this)
- [x] fix up links [and footnotes](https://github.com/rust-lang/rust/pull/39855#issuecomment-280168170) (@frewsxcv has volunteered to help with this)
- [x] change `src/doc/reference.md` to redirect to the book
- [x] move the reference on the doc index to be part of the bookshelf
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/f32.rs2
-rw-r--r--src/libstd/f64.rs2
-rw-r--r--src/libstd/macros.rs2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/f32.rs b/src/libstd/f32.rs
index 7a676c041ad..544f4f9ddbe 100644
--- a/src/libstd/f32.rs
+++ b/src/libstd/f32.rs
@@ -264,7 +264,7 @@ impl f32 {
     ///
     /// assert!(abs_difference <= f32::EPSILON);
     /// ```
-    /// [floating-point]: ../reference.html#machine-types
+    /// [floating-point]: ../reference/types.html#machine-types
     #[unstable(feature = "float_extras", reason = "signature is undecided",
                issue = "27752")]
     #[rustc_deprecated(since = "1.11.0",
diff --git a/src/libstd/f64.rs b/src/libstd/f64.rs
index 67a1c302483..dd4bc253bed 100644
--- a/src/libstd/f64.rs
+++ b/src/libstd/f64.rs
@@ -206,7 +206,7 @@ impl f64 {
     ///
     /// assert!(abs_difference < 1e-10);
     /// ```
-    /// [floating-point]: ../reference.html#machine-types
+    /// [floating-point]: ../reference/types.html#machine-types
     #[unstable(feature = "float_extras", reason = "signature is undecided",
                issue = "27752")]
     #[rustc_deprecated(since = "1.11.0",
diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs
index d79a9a202d9..a1f092621cb 100644
--- a/src/libstd/macros.rs
+++ b/src/libstd/macros.rs
@@ -441,7 +441,7 @@ pub mod builtin {
     /// leads to less duplicated code.
     ///
     /// The syntax given to this macro is the same syntax as [the `cfg`
-    /// attribute](../reference.html#conditional-compilation).
+    /// attribute](../book/conditional-compilation.html).
     ///
     /// # Examples
     ///