From 01cbdf4481915948773a8abfb67bcc1a44571dab Mon Sep 17 00:00:00 2001 From: Oliver Middleton Date: Wed, 13 Jan 2016 23:19:24 +0000 Subject: [PATCH] Fix some broken and missing links in the docs --- src/libcollections/lib.rs | 2 +- src/libcollections/str.rs | 2 +- src/libcollections/string.rs | 11 +++++++---- src/libcore/iter.rs | 2 +- src/librustc_unicode/char.rs | 8 ++++---- src/libstd/io/mod.rs | 26 +++++++++++++------------- 6 files changed, 27 insertions(+), 24 deletions(-) diff --git a/src/libcollections/lib.rs b/src/libcollections/lib.rs index 370857287d6..8b876df32af 100644 --- a/src/libcollections/lib.rs +++ b/src/libcollections/lib.rs @@ -10,7 +10,7 @@ //! Collection types. //! -//! See [std::collections](../std/collections) for a detailed discussion of +//! See [std::collections](../std/collections/index.html) for a detailed discussion of //! collections in Rust. #![crate_name = "collections"] diff --git a/src/libcollections/str.rs b/src/libcollections/str.rs index f3bdb0efeef..766867f284e 100644 --- a/src/libcollections/str.rs +++ b/src/libcollections/str.rs @@ -1384,7 +1384,7 @@ pub fn matches<'a, P: Pattern<'a>>(&'a self, pat: P) -> Matches<'a, P> { /// /// For iterating from the front, the [`matches()`] method can be used. /// - /// [`matches`]: #method.matches + /// [`matches()`]: #method.matches /// /// # Examples /// diff --git a/src/libcollections/string.rs b/src/libcollections/string.rs index d2cbcad875f..a611110a91a 100644 --- a/src/libcollections/string.rs +++ b/src/libcollections/string.rs @@ -62,6 +62,7 @@ /// hello.push_str("orld!"); /// ``` /// +/// [`char`]: ../primitive.char.html /// [`push()`]: #method.push /// [`push_str()`]: #method.push_str /// @@ -163,8 +164,8 @@ /// ``` /// /// [`as_ptr()`]: #method.as_ptr -/// [`len()`]: # method.len -/// [`capacity()`]: # method.capacity +/// [`len()`]: #method.len +/// [`capacity()`]: #method.capacity /// /// If a `String` has enough capacity, adding elements to it will not /// re-allocate. For example, consider this program: @@ -444,7 +445,7 @@ pub fn from_utf8(vec: Vec) -> Result { /// Converts a slice of bytes to a `String`, including invalid characters. /// /// A string slice ([`&str`]) is made of bytes ([`u8`]), and a slice of - /// bytes ([`&[u8]`]) is made of bytes, so this function converts between + /// bytes ([`&[u8]`][byteslice]) is made of bytes, so this function converts between /// the two. Not all byte slices are valid string slices, however: [`&str`] /// requires that it is valid UTF-8. During this conversion, /// `from_utf8_lossy()` will replace any invalid UTF-8 sequences with @@ -452,7 +453,7 @@ pub fn from_utf8(vec: Vec) -> Result { /// /// [`&str`]: ../primitive.str.html /// [`u8`]: ../primitive.u8.html - /// [`&[u8]`]: ../primitive.slice.html + /// [byteslice]: ../primitive.slice.html /// /// If you are sure that the byte slice is valid UTF-8, and you don't want /// to incur the overhead of the conversion, there is an unsafe version @@ -1311,6 +1312,8 @@ pub fn into_bytes(self) -> Vec { /// /// [`Utf8Error`]: ../str/struct.Utf8Error.html /// [`std::str`]: ../str/index.html + /// [`u8`]: ../primitive.u8.html + /// [`&str`]: ../primitive.str.html /// /// # Examples /// diff --git a/src/libcore/iter.rs b/src/libcore/iter.rs index c3bea050558..e3e783329ec 100644 --- a/src/libcore/iter.rs +++ b/src/libcore/iter.rs @@ -1358,7 +1358,7 @@ 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`] can - /// be thought of as single [`Result, E>`]. See the examples + /// be thought of as single `Result, E>`. See the examples /// below for more. /// /// [`String`]: ../string/struct.String.html diff --git a/src/librustc_unicode/char.rs b/src/librustc_unicode/char.rs index 66f8068eae6..46ecd3a80b5 100644 --- a/src/librustc_unicode/char.rs +++ b/src/librustc_unicode/char.rs @@ -46,8 +46,8 @@ /// This `struct` is created by the [`to_lowercase()`] method on [`char`]. See /// its documentation for more. /// -/// [`to_lowercase()`]: primitive.char.html#method.escape_to_lowercase -/// [`char`]: primitive.char.html +/// [`to_lowercase()`]: ../primitive.char.html#method.to_lowercase +/// [`char`]: ../primitive.char.html #[stable(feature = "rust1", since = "1.0.0")] pub struct ToLowercase(CaseMappingIter); @@ -64,8 +64,8 @@ fn next(&mut self) -> Option { /// This `struct` is created by the [`to_uppercase()`] method on [`char`]. See /// its documentation for more. /// -/// [`to_uppercase()`]: primitive.char.html#method.escape_to_uppercase -/// [`char`]: primitive.char.html +/// [`to_uppercase()`]: ../primitive.char.html#method.to_uppercase +/// [`char`]: ../primitive.char.html #[stable(feature = "rust1", since = "1.0.0")] pub struct ToUppercase(CaseMappingIter); diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index b5ba6ff54c0..40533117f06 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -112,7 +112,7 @@ //! ``` //! //! `BufWriter` doesn't add any new ways of writing; it just buffers every call -//! to [`write()`][write]: +//! to [`write()`][write()]: //! //! ``` //! use std::io; @@ -134,7 +134,7 @@ //! # } //! ``` //! -//! [write]: trait.Write.html#tymethod.write +//! [write()]: trait.Write.html#tymethod.write //! //! ## Standard input and output //! @@ -399,7 +399,7 @@ fn read_to_end(r: &mut R, buf: &mut Vec) -> Result /// /// [`File`][file]s implement `Read`: /// -/// [file]: ../std/fs/struct.File.html +/// [file]: ../fs/struct.File.html /// /// ``` /// use std::io; @@ -459,7 +459,7 @@ pub trait Read { /// /// [`File`][file]s implement `Read`: /// - /// [file]: ../std/fs/struct.File.html + /// [file]: ../fs/struct.File.html /// /// ``` /// use std::io; @@ -501,7 +501,7 @@ pub trait Read { /// /// [`File`][file]s implement `Read`: /// - /// [file]: ../std/fs/struct.File.html + /// [file]: ../fs/struct.File.html /// /// ``` /// use std::io; @@ -540,7 +540,7 @@ fn read_to_end(&mut self, buf: &mut Vec) -> Result { /// /// [`File`][file]s implement `Read`: /// - /// [file]: ../std/fs/struct.File.html + /// [file]: ../fs/struct.File.html /// /// ``` /// use std::io; @@ -600,7 +600,7 @@ fn read_to_string(&mut self, buf: &mut String) -> Result { /// /// [`File`][file]s implement `Read`: /// - /// [file]: ../std/fs/struct.File.html + /// [file]: ../fs/struct.File.html /// /// ``` /// use std::io; @@ -643,7 +643,7 @@ fn read_exact(&mut self, mut buf: &mut [u8]) -> Result<()> { /// /// [`File`][file]s implement `Read`: /// - /// [file]: ../std/fs/struct.File.html + /// [file]: ../fs/struct.File.html /// /// ``` /// use std::io; @@ -682,7 +682,7 @@ fn by_ref(&mut self) -> &mut Self where Self: Sized { self } /// /// [`File`][file]s implement `Read`: /// - /// [file]: ../std/fs/struct.File.html + /// [file]: ../fs/struct.File.html /// /// ``` /// use std::io; @@ -718,7 +718,7 @@ fn bytes(self) -> Bytes where Self: Sized { /// /// [`File`][file]s implement `Read`: /// - /// [file]: ../std/fs/struct.File.html + /// [file]: ../fs/struct.File.html /// /// ``` /// #![feature(io)] @@ -753,7 +753,7 @@ fn chars(self) -> Chars where Self: Sized { /// /// [`File`][file]s implement `Read`: /// - /// [file]: ../std/fs/struct.File.html + /// [file]: ../fs/struct.File.html /// /// ``` /// use std::io; @@ -789,7 +789,7 @@ fn chain(self, next: R) -> Chain where Self: Sized { /// /// [`File`][file]s implement `Read`: /// - /// [file]: ../std/fs/struct.File.html + /// [file]: ../fs/struct.File.html /// /// ``` /// use std::io; @@ -823,7 +823,7 @@ fn take(self, limit: u64) -> Take where Self: Sized { /// /// [`File`][file]s implement `Read`: /// - /// [file]: ../std/fs/struct.File.html + /// [file]: ../fs/struct.File.html /// /// ``` /// #![feature(io)]