mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #30886 - ollie27:docs_links, r=steveklabnik

Browse Source 
r? @steveklabnik
This commit is contained in:
Manish Goregaokar 2016-01-14 19:12:29 +05:30
commit 92aa326920
6 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libcollections/lib.rs
View File

@ -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"]

2
src/libcollections/str.rs
View File

@ -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
///

11
src/libcollections/string.rs
View File

@ -98,6 +98,7 @@
/// hello.push_str("orld!");
/// ```
///
/// [`char`]: ../primitive.char.html
/// [`push()`]: #method.push
/// [`push_str()`]: #method.push_str
///
@ -199,8 +200,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:
@ -480,7 +481,7 @@ pub fn from_utf8(vec: Vec<u8>) -> Result<String, FromUtf8Error> {
/// 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
@ -488,7 +489,7 @@ pub fn from_utf8(vec: Vec<u8>) -> Result<String, FromUtf8Error> {
///
/// [`&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
@ -1347,6 +1348,8 @@ pub fn into_bytes(self) -> Vec<u8> {
///
/// [`Utf8Error`]: ../str/struct.Utf8Error.html
/// [`std::str`]: ../str/index.html
/// [`u8`]: ../primitive.u8.html
/// [`&str`]: ../primitive.str.html
///
/// # Examples
///

2
src/libcore/iter.rs
View File

@ -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<T, E>`] can
/// be thought of as single [`Result<Collection<T>, E>`]. See the examples
/// be thought of as single `Result<Collection<T>, E>`. See the examples
/// below for more.
///
/// [`String`]: ../string/struct.String.html

8
src/librustc_unicode/char.rs
View File

@ -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<char> {
/// 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);

26
src/libstd/io/mod.rs
View File

@ -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: Read + ?Sized>(r: &mut R, buf: &mut Vec<u8>) -> Result<usize>
///
/// [`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<u8>) -> Result<usize> {
///
/// [`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<usize> {
///
/// [`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<Self> 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<Self> 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<R: Read>(self, next: R) -> Chain<Self, R> 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<Self> where Self: Sized {
///
/// [`File`][file]s implement `Read`:
///
/// [file]: ../std/fs/struct.File.html
/// [file]: ../fs/struct.File.html
///
/// ```
/// #![feature(io)]