Fix a few links in the docs

diff --git a/src/doc/book/ffi.md b/src/doc/book/ffi.md
index 50d4d0170fc70809c82b2dc392b3373f50b81f4c..8ab580e6aa9fd7a5a4850142eee35ab596292bc0 100644 (file)
--- a/src/doc/book/ffi.md
+++ b/src/doc/book/ffi.md
@@ -710,7 +710,7 @@ Please note that [`catch_unwind()`] will only catch unwinding panics, not
 those who abort the process. See the documentation of [`catch_unwind()`]
 for more information.
 
-[`catch_unwind()`]: https://doc.rust-lang.org/std/panic/fn.catch_unwind.html
+[`catch_unwind()`]: ../std/panic/fn.catch_unwind.html
 
 # Representing opaque structs
 

diff --git a/src/liballoc/arc.rs b/src/liballoc/arc.rs
index 459dc94f33686531efd9ada73e127cfc776dfebf..38d843263ffda09c7c1609e684a42da31a9763df 100644 (file)
--- a/src/liballoc/arc.rs
+++ b/src/liballoc/arc.rs
@@ -59,7 +59,7 @@
 /// as long as `T` implements [`Send`] and [`Sync`][sync]. The disadvantage is
 /// that atomic operations are more expensive than ordinary memory accesses.
 /// If you are not sharing reference-counted values between threads, consider
-/// using [`rc::Rc`] for lower overhead. [`Rc`] is a safe default, because
+/// using [`rc::Rc`][`Rc`] for lower overhead. [`Rc`] is a safe default, because
 /// the compiler will catch any attempt to send an [`Rc`] between threads.
 /// However, a library might choose `Arc` in order to give library consumers
 /// more flexibility.

diff --git a/src/libcore/hash/mod.rs b/src/libcore/hash/mod.rs
index 92657a6d0b1ca3d3a49bf762d0a629f7a1fc42a8..dd6edc7d39af0ca0afca1f2be4418cd9430099df 100644 (file)
--- a/src/libcore/hash/mod.rs
+++ b/src/libcore/hash/mod.rs
@@ -307,6 +307,7 @@ pub trait BuildHasher {
 /// [`BuildHasher`]: trait.BuildHasher.html
 /// [`Default`]: ../default/trait.Default.html
 /// [`Hasher`]: trait.Hasher.html
+/// [`HashMap`]: ../../std/collections/struct.HashMap.html
 #[stable(since = "1.7.0", feature = "build_hasher")]
 pub struct BuildHasherDefault<H>(marker::PhantomData<H>);
 

diff --git a/src/libcore/iter/iterator.rs b/src/libcore/iter/iterator.rs
index 91c09c5530565144660d761ae36784e17d7fcec0..3b406873d4b191b63fc2d5a71cc416fd884d4606 100644 (file)
--- a/src/libcore/iter/iterator.rs
+++ b/src/libcore/iter/iterator.rs
@@ -1108,9 +1108,9 @@ fn by_ref(&mut self) -> &mut Self where Self: Sized { self }
     ///
     /// One of the keys to `collect()`'s power is that many things you might
     /// not think of as 'collections' actually are. For example, a [`String`]
-    /// is a collection of [`char`]s. And a collection of [`Result<T, E>`] can
-    /// be thought of as single [`Result`]`<Collection<T>, E>`. See the examples
-    /// below for more.
+    /// is a collection of [`char`]s. And a collection of
+    /// [`Result<T, E>`][`Result`] can be thought of as single
+    /// [`Result`]`<Collection<T>, E>`. See the examples below for more.
     ///
     /// Because `collect()` is so general, it can cause problems with type
     /// inference. As such, `collect()` is one of the few times you'll see

diff --git a/src/libcore/sync/atomic.rs b/src/libcore/sync/atomic.rs
index a3cb12844777badcb616fd8623b00b2531667f80..743e3c41170a34d0c99ef3575cd234811eb3deb2 100644 (file)
--- a/src/libcore/sync/atomic.rs
+++ b/src/libcore/sync/atomic.rs
@@ -24,7 +24,7 @@
 //! same as [LLVM atomic orderings][1]. For more information see the [nomicon][2].
 //!
 //! [1]: http://llvm.org/docs/LangRef.html#memory-model-for-concurrent-operations
-//! [2]: https://doc.rust-lang.org/nomicon/atomics.html
+//! [2]: ../../../nomicon/atomics.html
 //!
 //! Atomic variables are safe to share between threads (they implement `Sync`)
 //! but they do not themselves provide the mechanism for sharing and follow the
@@ -144,7 +144,7 @@ unsafe impl<T> Sync for AtomicPtr<T> {}
 /// LLVM's](http://llvm.org/docs/LangRef.html#memory-model-for-concurrent-operations).
 ///
 /// For more information see the [nomicon][1].
-/// [1]: https://doc.rust-lang.org/nomicon/atomics.html
+/// [1]: ../../../nomicon/atomics.html
 #[stable(feature = "rust1", since = "1.0.0")]
 #[derive(Copy, Clone, Debug)]
 pub enum Ordering {

diff --git a/src/libstd/env.rs b/src/libstd/env.rs
index 80c64ae860f8fcaee61259bd4ddd14bc650e6f44..c3a6b2433ed8815acb1460ba3800a2a13857738b 100644 (file)
--- a/src/libstd/env.rs
+++ b/src/libstd/env.rs
@@ -222,7 +222,7 @@ fn _var_os(key: &OsStr) -> Option<OsString> {
 
 /// Possible errors from the [`env::var`] function.
 ///
-/// [env::var]: fn.var.html
+/// [`env::var`]: fn.var.html
 #[derive(Debug, PartialEq, Eq, Clone)]
 #[stable(feature = "env", since = "1.0.0")]
 pub enum VarError {

diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs
index 07a9b4bed99202f8f65973d0bc3fe771ee3b94cb..8789006436c0c7baa2cfe93a0960b3ea1b4faa57 100644 (file)
--- a/src/libstd/thread/mod.rs
+++ b/src/libstd/thread/mod.rs
@@ -391,7 +391,7 @@ pub fn spawn<F, T>(self, f: F) -> io::Result<JoinHandle<T>> where
 /// [`JoinHandle`]: ../../std/thread/struct.JoinHandle.html
 /// [`join`]: ../../std/thread/struct.JoinHandle.html#method.join
 /// [`Err`]: ../../std/result/enum.Result.html#variant.Err
-/// [`panic!`]: ../../std/macro.panic.html
+/// [`panic`]: ../../std/macro.panic.html
 /// [`Builder::spawn`]: ../../std/thread/struct.Builder.html#method.spawn
 ///
 /// # Examples
@@ -974,7 +974,7 @@ pub fn thread(&self) -> &Thread {
     /// to [`panic`].
     ///
     /// [`Err`]: ../../std/result/enum.Result.html#variant.Err
-    /// [`panic!`]: ../../std/macro.panic.html
+    /// [`panic`]: ../../std/macro.panic.html
     ///
     /// # Examples
     ///