Skip to content

Commit 7c75608

Browse files
committed
Rollup merge of #39344 - ollie27:links, r=steveklabnik
Fix a few links in the docs r? @steveklabnik
2 parents 915242a + 09b3903 commit 7c75608

File tree

7 files changed

+11
-10
lines changed

7 files changed

+11
-10
lines changed

src/doc/book/ffi.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,7 @@ Please note that [`catch_unwind()`] will only catch unwinding panics, not
710710
those who abort the process. See the documentation of [`catch_unwind()`]
711711
for more information.
712712

713-
[`catch_unwind()`]: https://doc.rust-lang.org/std/panic/fn.catch_unwind.html
713+
[`catch_unwind()`]: ../std/panic/fn.catch_unwind.html
714714

715715
# Representing opaque structs
716716

src/liballoc/arc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ const MAX_REFCOUNT: usize = (isize::MAX) as usize;
5959
/// as long as `T` implements [`Send`] and [`Sync`][sync]. The disadvantage is
6060
/// that atomic operations are more expensive than ordinary memory accesses.
6161
/// If you are not sharing reference-counted values between threads, consider
62-
/// using [`rc::Rc`] for lower overhead. [`Rc`] is a safe default, because
62+
/// using [`rc::Rc`][`Rc`] for lower overhead. [`Rc`] is a safe default, because
6363
/// the compiler will catch any attempt to send an [`Rc`] between threads.
6464
/// However, a library might choose `Arc` in order to give library consumers
6565
/// more flexibility.

src/libcore/hash/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,7 @@ pub trait BuildHasher {
307307
/// [`BuildHasher`]: trait.BuildHasher.html
308308
/// [`Default`]: ../default/trait.Default.html
309309
/// [`Hasher`]: trait.Hasher.html
310+
/// [`HashMap`]: ../../std/collections/struct.HashMap.html
310311
#[stable(since = "1.7.0", feature = "build_hasher")]
311312
pub struct BuildHasherDefault<H>(marker::PhantomData<H>);
312313

src/libcore/iter/iterator.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,9 +1108,9 @@ pub trait Iterator {
11081108
///
11091109
/// One of the keys to `collect()`'s power is that many things you might
11101110
/// not think of as 'collections' actually are. For example, a [`String`]
1111-
/// is a collection of [`char`]s. And a collection of [`Result<T, E>`] can
1112-
/// be thought of as single [`Result`]`<Collection<T>, E>`. See the examples
1113-
/// below for more.
1111+
/// is a collection of [`char`]s. And a collection of
1112+
/// [`Result<T, E>`][`Result`] can be thought of as single
1113+
/// [`Result`]`<Collection<T>, E>`. See the examples below for more.
11141114
///
11151115
/// Because `collect()` is so general, it can cause problems with type
11161116
/// inference. As such, `collect()` is one of the few times you'll see

src/libcore/sync/atomic.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
//! same as [LLVM atomic orderings][1]. For more information see the [nomicon][2].
2525
//!
2626
//! [1]: http://llvm.org/docs/LangRef.html#memory-model-for-concurrent-operations
27-
//! [2]: https://doc.rust-lang.org/nomicon/atomics.html
27+
//! [2]: ../../../nomicon/atomics.html
2828
//!
2929
//! Atomic variables are safe to share between threads (they implement `Sync`)
3030
//! but they do not themselves provide the mechanism for sharing and follow the
@@ -144,7 +144,7 @@ unsafe impl<T> Sync for AtomicPtr<T> {}
144144
/// LLVM's](http://llvm.org/docs/LangRef.html#memory-model-for-concurrent-operations).
145145
///
146146
/// For more information see the [nomicon][1].
147-
/// [1]: https://doc.rust-lang.org/nomicon/atomics.html
147+
/// [1]: ../../../nomicon/atomics.html
148148
#[stable(feature = "rust1", since = "1.0.0")]
149149
#[derive(Copy, Clone, Debug)]
150150
pub enum Ordering {

src/libstd/env.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ fn _var_os(key: &OsStr) -> Option<OsString> {
222222

223223
/// Possible errors from the [`env::var`] function.
224224
///
225-
/// [env::var]: fn.var.html
225+
/// [`env::var`]: fn.var.html
226226
#[derive(Debug, PartialEq, Eq, Clone)]
227227
#[stable(feature = "env", since = "1.0.0")]
228228
pub enum VarError {

src/libstd/thread/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ impl Builder {
391391
/// [`JoinHandle`]: ../../std/thread/struct.JoinHandle.html
392392
/// [`join`]: ../../std/thread/struct.JoinHandle.html#method.join
393393
/// [`Err`]: ../../std/result/enum.Result.html#variant.Err
394-
/// [`panic!`]: ../../std/macro.panic.html
394+
/// [`panic`]: ../../std/macro.panic.html
395395
/// [`Builder::spawn`]: ../../std/thread/struct.Builder.html#method.spawn
396396
///
397397
/// # Examples
@@ -974,7 +974,7 @@ impl<T> JoinHandle<T> {
974974
/// to [`panic`].
975975
///
976976
/// [`Err`]: ../../std/result/enum.Result.html#variant.Err
977-
/// [`panic!`]: ../../std/macro.panic.html
977+
/// [`panic`]: ../../std/macro.panic.html
978978
///
979979
/// # Examples
980980
///

0 commit comments

Comments
 (0)