Various fixes to wording consistency in the docs

This commit is contained in:
Stjepan Glavina 2017-03-22 01:42:23 +01:00
parent cab4bff3de
commit d6da1d9b46
18 changed files with 61 additions and 62 deletions

View File

@ -930,13 +930,13 @@ impl<'a, T> Hole<'a, T> {
self.pos self.pos
} }
/// Return a reference to the element removed /// Returns a reference to the element removed.
#[inline] #[inline]
fn element(&self) -> &T { fn element(&self) -> &T {
self.elt.as_ref().unwrap() self.elt.as_ref().unwrap()
} }
/// Return a reference to the element at `index`. /// Returns a reference to the element at `index`.
/// ///
/// Unsafe because index must be within the data slice and not equal to pos. /// Unsafe because index must be within the data slice and not equal to pos.
#[inline] #[inline]

View File

@ -526,7 +526,7 @@ impl<K: Ord, V> BTreeMap<K, V> {
} }
} }
/// Returns true if the map contains a value for the specified key. /// Returns `true` if the map contains a value for the specified key.
/// ///
/// The key may be any borrowed form of the map's key type, but the ordering /// The key may be any borrowed form of the map's key type, but the ordering
/// on the borrowed form *must* match the ordering on the key type. /// on the borrowed form *must* match the ordering on the key type.
@ -1965,7 +1965,7 @@ impl<K, V> BTreeMap<K, V> {
self.length self.length
} }
/// Returns true if the map contains no elements. /// Returns `true` if the map contains no elements.
/// ///
/// # Examples /// # Examples
/// ///

View File

@ -415,7 +415,7 @@ impl<T: Ord> BTreeSet<T> {
self.map.len() self.map.len()
} }
/// Returns true if the set contains no elements. /// Returns `true` if the set contains no elements.
/// ///
/// # Examples /// # Examples
/// ///

View File

@ -106,7 +106,7 @@ impl<E: CLike> EnumSet<E> {
self.bits.count_ones() as usize self.bits.count_ones() as usize
} }
/// Returns true if the `EnumSet` is empty. /// Returns `true` if the `EnumSet` is empty.
pub fn is_empty(&self) -> bool { pub fn is_empty(&self) -> bool {
self.bits == 0 self.bits == 0
} }

View File

@ -20,9 +20,9 @@ use Bound::{self, Excluded, Included, Unbounded};
/// **RangeArgument** is implemented by Rust's built-in range types, produced /// **RangeArgument** is implemented by Rust's built-in range types, produced
/// by range syntax like `..`, `a..`, `..b` or `c..d`. /// by range syntax like `..`, `a..`, `..b` or `c..d`.
pub trait RangeArgument<T: ?Sized> { pub trait RangeArgument<T: ?Sized> {
/// Start index bound /// Start index bound.
/// ///
/// Return start value as a `Bound` /// Returns start value as a `Bound`.
/// ///
/// # Examples /// # Examples
/// ///
@ -42,9 +42,9 @@ pub trait RangeArgument<T: ?Sized> {
/// ``` /// ```
fn start(&self) -> Bound<&T>; fn start(&self) -> Bound<&T>;
/// End index bound /// End index bound.
/// ///
/// Return end value as a `Bound` /// Returns end value as a `Bound`.
/// ///
/// # Examples /// # Examples
/// ///

View File

@ -195,7 +195,7 @@ impl<T> [T] {
core_slice::SliceExt::is_empty(self) core_slice::SliceExt::is_empty(self)
} }
/// Returns the first element of a slice, or `None` if it is empty. /// Returns the first element of the slice, or `None` if it is empty.
/// ///
/// # Examples /// # Examples
/// ///
@ -212,7 +212,7 @@ impl<T> [T] {
core_slice::SliceExt::first(self) core_slice::SliceExt::first(self)
} }
/// Returns a mutable pointer to the first element of a slice, or `None` if it is empty. /// Returns a mutable pointer to the first element of the slice, or `None` if it is empty.
/// ///
/// # Examples /// # Examples
/// ///
@ -230,7 +230,7 @@ impl<T> [T] {
core_slice::SliceExt::first_mut(self) core_slice::SliceExt::first_mut(self)
} }
/// Returns the first and all the rest of the elements of a slice, or `None` if it is empty. /// Returns the first and all the rest of the elements of the slice, or `None` if it is empty.
/// ///
/// # Examples /// # Examples
/// ///
@ -248,7 +248,7 @@ impl<T> [T] {
core_slice::SliceExt::split_first(self) core_slice::SliceExt::split_first(self)
} }
/// Returns the first and all the rest of the elements of a slice, or `None` if it is empty. /// Returns the first and all the rest of the elements of the slice, or `None` if it is empty.
/// ///
/// # Examples /// # Examples
/// ///
@ -268,7 +268,7 @@ impl<T> [T] {
core_slice::SliceExt::split_first_mut(self) core_slice::SliceExt::split_first_mut(self)
} }
/// Returns the last and all the rest of the elements of a slice, or `None` if it is empty. /// Returns the last and all the rest of the elements of the slice, or `None` if it is empty.
/// ///
/// # Examples /// # Examples
/// ///
@ -287,7 +287,7 @@ impl<T> [T] {
} }
/// Returns the last and all the rest of the elements of a slice, or `None` if it is empty. /// Returns the last and all the rest of the elements of the slice, or `None` if it is empty.
/// ///
/// # Examples /// # Examples
/// ///
@ -307,7 +307,7 @@ impl<T> [T] {
core_slice::SliceExt::split_last_mut(self) core_slice::SliceExt::split_last_mut(self)
} }
/// Returns the last element of a slice, or `None` if it is empty. /// Returns the last element of the slice, or `None` if it is empty.
/// ///
/// # Examples /// # Examples
/// ///
@ -485,7 +485,7 @@ impl<T> [T] {
core_slice::SliceExt::as_mut_ptr(self) core_slice::SliceExt::as_mut_ptr(self)
} }
/// Swaps two elements in a slice. /// Swaps two elements in the slice.
/// ///
/// # Arguments /// # Arguments
/// ///
@ -509,7 +509,7 @@ impl<T> [T] {
core_slice::SliceExt::swap(self, a, b) core_slice::SliceExt::swap(self, a, b)
} }
/// Reverses the order of elements in a slice, in place. /// Reverses the order of elements in the slice, in place.
/// ///
/// # Example /// # Example
/// ///
@ -955,7 +955,7 @@ impl<T> [T] {
core_slice::SliceExt::ends_with(self, needle) core_slice::SliceExt::ends_with(self, needle)
} }
/// Binary search a sorted slice for a given element. /// Binary searches this sorted slice for a given element.
/// ///
/// If the value is found then `Ok` is returned, containing the /// If the value is found then `Ok` is returned, containing the
/// index of the matching element; if the value is not found then /// index of the matching element; if the value is not found then
@ -984,7 +984,7 @@ impl<T> [T] {
core_slice::SliceExt::binary_search(self, x) core_slice::SliceExt::binary_search(self, x)
} }
/// Binary search a sorted slice with a comparator function. /// Binary searches this sorted slice with a comparator function.
/// ///
/// The comparator function should implement an order consistent /// The comparator function should implement an order consistent
/// with the sort order of the underlying slice, returning an /// with the sort order of the underlying slice, returning an
@ -1023,7 +1023,7 @@ impl<T> [T] {
core_slice::SliceExt::binary_search_by(self, f) core_slice::SliceExt::binary_search_by(self, f)
} }
/// Binary search a sorted slice with a key extraction function. /// Binary searches this sorted slice with a key extraction function.
/// ///
/// Assumes that the slice is sorted by the key, for instance with /// Assumes that the slice is sorted by the key, for instance with
/// [`sort_by_key`] using the same key extraction function. /// [`sort_by_key`] using the same key extraction function.
@ -1092,7 +1092,7 @@ impl<T> [T] {
merge_sort(self, |a, b| a.lt(b)); merge_sort(self, |a, b| a.lt(b));
} }
/// Sorts the slice using `compare` to compare elements. /// Sorts the slice with a comparator function.
/// ///
/// This sort is stable (i.e. does not reorder equal elements) and `O(n log n)` worst-case. /// This sort is stable (i.e. does not reorder equal elements) and `O(n log n)` worst-case.
/// ///
@ -1125,7 +1125,7 @@ impl<T> [T] {
merge_sort(self, |a, b| compare(a, b) == Less); merge_sort(self, |a, b| compare(a, b) == Less);
} }
/// Sorts the slice using `f` to extract a key to compare elements by. /// Sorts the slice with a key extraction function.
/// ///
/// This sort is stable (i.e. does not reorder equal elements) and `O(n log n)` worst-case. /// This sort is stable (i.e. does not reorder equal elements) and `O(n log n)` worst-case.
/// ///
@ -1191,8 +1191,8 @@ impl<T> [T] {
core_slice::SliceExt::sort_unstable(self); core_slice::SliceExt::sort_unstable(self);
} }
/// Sorts the slice using `compare` to compare elements, but may not preserve the order of /// Sorts the slice with a comparator function, but may not preserve the order of equal
/// equal elements. /// elements.
/// ///
/// This sort is unstable (i.e. may reorder equal elements), in-place (i.e. does not allocate), /// This sort is unstable (i.e. may reorder equal elements), in-place (i.e. does not allocate),
/// and `O(n log n)` worst-case. /// and `O(n log n)` worst-case.
@ -1231,8 +1231,8 @@ impl<T> [T] {
core_slice::SliceExt::sort_unstable_by(self, compare); core_slice::SliceExt::sort_unstable_by(self, compare);
} }
/// Sorts the slice using `f` to extract a key to compare elements by, but may not preserve the /// Sorts the slice with a key extraction function, but may not preserve the order of equal
/// order of equal elements. /// elements.
/// ///
/// This sort is unstable (i.e. may reorder equal elements), in-place (i.e. does not allocate), /// This sort is unstable (i.e. may reorder equal elements), in-place (i.e. does not allocate),
/// and `O(n log n)` worst-case. /// and `O(n log n)` worst-case.
@ -1313,7 +1313,6 @@ impl<T> [T] {
core_slice::SliceExt::copy_from_slice(self, src) core_slice::SliceExt::copy_from_slice(self, src)
} }
/// Copies `self` into a new `Vec`. /// Copies `self` into a new `Vec`.
/// ///
/// # Examples /// # Examples

View File

@ -204,7 +204,7 @@ impl str {
core_str::StrExt::len(self) core_str::StrExt::len(self)
} }
/// Returns true if this slice has a length of zero bytes. /// Returns `true` if `self` has a length of zero bytes.
/// ///
/// # Examples /// # Examples
/// ///

View File

@ -133,7 +133,7 @@ impl<T> VecDeque<T> {
ptr::write(self.ptr().offset(off as isize), value); ptr::write(self.ptr().offset(off as isize), value);
} }
/// Returns true if and only if the buffer is at capacity /// Returns `true` if and only if the buffer is at full capacity.
#[inline] #[inline]
fn is_full(&self) -> bool { fn is_full(&self) -> bool {
self.cap() - self.len() == 1 self.cap() - self.len() == 1
@ -788,7 +788,7 @@ impl<T> VecDeque<T> {
count(self.tail, self.head, self.cap()) count(self.tail, self.head, self.cap())
} }
/// Returns true if the buffer contains no elements /// Returns `true` if the `VecDeque` is empty.
/// ///
/// # Examples /// # Examples
/// ///

View File

@ -137,7 +137,7 @@ impl fmt::Debug for Any + Send {
} }
impl Any { impl Any {
/// Returns true if the boxed type is the same as `T`. /// Returns `true` if the boxed type is the same as `T`.
/// ///
/// # Examples /// # Examples
/// ///

View File

@ -210,7 +210,7 @@ pub enum Ordering {
} }
impl Ordering { impl Ordering {
/// Reverse the `Ordering`. /// Reverses the `Ordering`.
/// ///
/// * `Less` becomes `Greater`. /// * `Less` becomes `Greater`.
/// * `Greater` becomes `Less`. /// * `Greater` becomes `Less`.
@ -616,7 +616,7 @@ pub trait PartialOrd<Rhs: ?Sized = Self>: PartialEq<Rhs> {
} }
} }
/// Compare and return the minimum of two values. /// Compares and returns the minimum of two values.
/// ///
/// Returns the first argument if the comparison determines them to be equal. /// Returns the first argument if the comparison determines them to be equal.
/// ///
@ -634,7 +634,7 @@ pub fn min<T: Ord>(v1: T, v2: T) -> T {
if v1 <= v2 { v1 } else { v2 } if v1 <= v2 { v1 } else { v2 }
} }
/// Compare and return the maximum of two values. /// Compares and returns the maximum of two values.
/// ///
/// Returns the second argument if the comparison determines them to be equal. /// Returns the second argument if the comparison determines them to be equal.
/// ///

View File

@ -22,7 +22,7 @@
#[doc(hidden)] #[doc(hidden)]
pub unsafe trait TrustedRandomAccess : ExactSizeIterator { pub unsafe trait TrustedRandomAccess : ExactSizeIterator {
unsafe fn get_unchecked(&mut self, i: usize) -> Self::Item; unsafe fn get_unchecked(&mut self, i: usize) -> Self::Item;
/// Return `true` if getting an iterator element may have /// Returns `true` if getting an iterator element may have
/// side effects. Remember to take inner iterators into account. /// side effects. Remember to take inner iterators into account.
fn may_have_side_effect() -> bool; fn may_have_side_effect() -> bool;
} }

View File

@ -148,14 +148,14 @@ macro_rules! define_bignum {
$name { size: sz, base: base } $name { size: sz, base: base }
} }
/// Return the internal digits as a slice `[a, b, c, ...]` such that the numeric /// Returns the internal digits as a slice `[a, b, c, ...]` such that the numeric
/// value is `a + b * 2^W + c * 2^(2W) + ...` where `W` is the number of bits in /// value is `a + b * 2^W + c * 2^(2W) + ...` where `W` is the number of bits in
/// the digit type. /// the digit type.
pub fn digits(&self) -> &[$ty] { pub fn digits(&self) -> &[$ty] {
&self.base[..self.size] &self.base[..self.size]
} }
/// Return the `i`-th bit where bit 0 is the least significant one. /// Returns the `i`-th bit where bit 0 is the least significant one.
/// In other words, the bit with weight `2^i`. /// In other words, the bit with weight `2^i`.
pub fn get_bit(&self, i: usize) -> u8 { pub fn get_bit(&self, i: usize) -> u8 {
use mem; use mem;
@ -166,7 +166,7 @@ macro_rules! define_bignum {
((self.base[d] >> b) & 1) as u8 ((self.base[d] >> b) & 1) as u8
} }
/// Returns true if the bignum is zero. /// Returns `true` if the bignum is zero.
pub fn is_zero(&self) -> bool { pub fn is_zero(&self) -> bool {
self.digits().iter().all(|&v| v == 0) self.digits().iter().all(|&v| v == 0)
} }

View File

@ -2568,17 +2568,17 @@ pub trait Float: Sized {
implementable outside the standard library")] implementable outside the standard library")]
fn one() -> Self; fn one() -> Self;
/// Returns true if this value is NaN and false otherwise. /// Returns `true` if this value is NaN and false otherwise.
#[stable(feature = "core", since = "1.6.0")] #[stable(feature = "core", since = "1.6.0")]
fn is_nan(self) -> bool; fn is_nan(self) -> bool;
/// Returns true if this value is positive infinity or negative infinity and /// Returns `true` if this value is positive infinity or negative infinity and
/// false otherwise. /// false otherwise.
#[stable(feature = "core", since = "1.6.0")] #[stable(feature = "core", since = "1.6.0")]
fn is_infinite(self) -> bool; fn is_infinite(self) -> bool;
/// Returns true if this number is neither infinite nor NaN. /// Returns `true` if this number is neither infinite nor NaN.
#[stable(feature = "core", since = "1.6.0")] #[stable(feature = "core", since = "1.6.0")]
fn is_finite(self) -> bool; fn is_finite(self) -> bool;
/// Returns true if this number is neither zero, infinite, denormal, or NaN. /// Returns `true` if this number is neither zero, infinite, denormal, or NaN.
#[stable(feature = "core", since = "1.6.0")] #[stable(feature = "core", since = "1.6.0")]
fn is_normal(self) -> bool; fn is_normal(self) -> bool;
/// Returns the category that this number falls into. /// Returns the category that this number falls into.

View File

@ -380,7 +380,7 @@ pub unsafe fn write_volatile<T>(dst: *mut T, src: T) {
#[lang = "const_ptr"] #[lang = "const_ptr"]
impl<T: ?Sized> *const T { impl<T: ?Sized> *const T {
/// Returns true if the pointer is null. /// Returns `true` if the pointer is null.
/// ///
/// # Examples /// # Examples
/// ///
@ -504,7 +504,7 @@ impl<T: ?Sized> *const T {
#[lang = "mut_ptr"] #[lang = "mut_ptr"]
impl<T: ?Sized> *mut T { impl<T: ?Sized> *mut T {
/// Returns true if the pointer is null. /// Returns `true` if the pointer is null.
/// ///
/// # Examples /// # Examples
/// ///

View File

@ -268,7 +268,7 @@ impl<T, E> Result<T, E> {
// Querying the contained values // Querying the contained values
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
/// Returns true if the result is `Ok`. /// Returns `true` if the result is `Ok`.
/// ///
/// # Examples /// # Examples
/// ///
@ -290,7 +290,7 @@ impl<T, E> Result<T, E> {
} }
} }
/// Returns true if the result is `Err`. /// Returns `true` if the result is `Err`.
/// ///
/// # Examples /// # Examples
/// ///

View File

@ -1511,7 +1511,7 @@ fn ptrdistance<T>(start: *const T, end: *const T) -> usize {
trait PointerExt : Copy { trait PointerExt : Copy {
unsafe fn slice_offset(self, i: isize) -> Self; unsafe fn slice_offset(self, i: isize) -> Self;
/// Increment self by 1, but return the old value /// Increments `self` by 1, but returns the old value.
#[inline(always)] #[inline(always)]
unsafe fn post_inc(&mut self) -> Self { unsafe fn post_inc(&mut self) -> Self {
let current = *self; let current = *self;
@ -1519,7 +1519,7 @@ trait PointerExt : Copy {
current current
} }
/// Decrement self by 1, and return the new value /// Decrements `self` by 1, and returns the new value.
#[inline(always)] #[inline(always)]
unsafe fn pre_dec(&mut self) -> Self { unsafe fn pre_dec(&mut self) -> Self {
*self = self.slice_offset(-1); *self = self.slice_offset(-1);
@ -1545,7 +1545,7 @@ impl<T> PointerExt for *mut T {
/// splitn, splitn_mut etc can be implemented once. /// splitn, splitn_mut etc can be implemented once.
#[doc(hidden)] #[doc(hidden)]
trait SplitIter: DoubleEndedIterator { trait SplitIter: DoubleEndedIterator {
/// Mark the underlying iterator as complete, extracting the remaining /// Marks the underlying iterator as complete, extracting the remaining
/// portion of the slice. /// portion of the slice.
fn finish(&mut self) -> Option<Self::Item>; fn finish(&mut self) -> Option<Self::Item>;
} }
@ -2267,11 +2267,11 @@ pub fn heapsort<T, F>(v: &mut [T], mut is_less: F)
// //
extern { extern {
/// Call implementation provided memcmp /// Calls implementation provided memcmp.
/// ///
/// Interprets the data as u8. /// Interprets the data as u8.
/// ///
/// Return 0 for equal, < 0 for less than and > 0 for greater /// Returns 0 for equal, < 0 for less than and > 0 for greater
/// than. /// than.
// FIXME(#32610): Return type should be c_int // FIXME(#32610): Return type should be c_int
fn memcmp(s1: *const u8, s2: *const u8, n: usize) -> i32; fn memcmp(s1: *const u8, s2: *const u8, n: usize) -> i32;

View File

@ -104,7 +104,7 @@ fn shift_tail<T, F>(v: &mut [T], is_less: &mut F)
/// Partially sorts a slice by shifting several out-of-order elements around. /// Partially sorts a slice by shifting several out-of-order elements around.
/// ///
/// Returns true if the slice is sorted at the end. This function is `O(n)` worst-case. /// Returns `true` if the slice is sorted at the end. This function is `O(n)` worst-case.
#[cold] #[cold]
fn partial_insertion_sort<T, F>(v: &mut [T], is_less: &mut F) -> bool fn partial_insertion_sort<T, F>(v: &mut [T], is_less: &mut F) -> bool
where F: FnMut(&T, &T) -> bool where F: FnMut(&T, &T) -> bool
@ -528,7 +528,7 @@ fn break_patterns<T>(v: &mut [T]) {
} }
} }
/// Chooses a pivot in `v` and returns the index and true if the slice is likely already sorted. /// Chooses a pivot in `v` and returns the index and `true` if the slice is likely already sorted.
/// ///
/// Elements in `v` might be reordered in the process. /// Elements in `v` might be reordered in the process.
fn choose_pivot<T, F>(v: &mut [T], is_less: &mut F) -> (usize, bool) fn choose_pivot<T, F>(v: &mut [T], is_less: &mut F) -> (usize, bool)

View File

@ -343,13 +343,13 @@ pub struct Chars<'a> {
iter: slice::Iter<'a, u8> iter: slice::Iter<'a, u8>
} }
/// Return the initial codepoint accumulator for the first byte. /// Returns the initial codepoint accumulator for the first byte.
/// The first byte is special, only want bottom 5 bits for width 2, 4 bits /// The first byte is special, only want bottom 5 bits for width 2, 4 bits
/// for width 3, and 3 bits for width 4. /// for width 3, and 3 bits for width 4.
#[inline] #[inline]
fn utf8_first_byte(byte: u8, width: u32) -> u32 { (byte & (0x7F >> width)) as u32 } fn utf8_first_byte(byte: u8, width: u32) -> u32 { (byte & (0x7F >> width)) as u32 }
/// Return the value of `ch` updated with continuation byte `byte`. /// Returns the value of `ch` updated with continuation byte `byte`.
#[inline] #[inline]
fn utf8_acc_cont_byte(ch: u32, byte: u8) -> u32 { (ch << 6) | (byte & CONT_MASK) as u32 } fn utf8_acc_cont_byte(ch: u32, byte: u8) -> u32 { (ch << 6) | (byte & CONT_MASK) as u32 }
@ -1244,13 +1244,13 @@ Section: UTF-8 validation
// use truncation to fit u64 into usize // use truncation to fit u64 into usize
const NONASCII_MASK: usize = 0x80808080_80808080u64 as usize; const NONASCII_MASK: usize = 0x80808080_80808080u64 as usize;
/// Return `true` if any byte in the word `x` is nonascii (>= 128). /// Returns `true` if any byte in the word `x` is nonascii (>= 128).
#[inline] #[inline]
fn contains_nonascii(x: usize) -> bool { fn contains_nonascii(x: usize) -> bool {
(x & NONASCII_MASK) != 0 (x & NONASCII_MASK) != 0
} }
/// Walk through `iter` checking that it's a valid UTF-8 sequence, /// Walks through `iter` checking that it's a valid UTF-8 sequence,
/// returning `true` in that case, or, if it is invalid, `false` with /// returning `true` in that case, or, if it is invalid, `false` with
/// `iter` reset such that it is pointing at the first byte in the /// `iter` reset such that it is pointing at the first byte in the
/// invalid sequence. /// invalid sequence.
@ -1389,16 +1389,16 @@ static UTF8_CHAR_WIDTH: [u8; 256] = [
4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0, // 0xFF 4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0, // 0xFF
]; ];
/// Given a first byte, determine how many bytes are in this UTF-8 character /// Given a first byte, determines how many bytes are in this UTF-8 character.
#[unstable(feature = "str_internals", issue = "0")] #[unstable(feature = "str_internals", issue = "0")]
#[inline] #[inline]
pub fn utf8_char_width(b: u8) -> usize { pub fn utf8_char_width(b: u8) -> usize {
return UTF8_CHAR_WIDTH[b as usize] as usize; return UTF8_CHAR_WIDTH[b as usize] as usize;
} }
/// Mask of the value bits of a continuation byte /// Mask of the value bits of a continuation byte.
const CONT_MASK: u8 = 0b0011_1111; const CONT_MASK: u8 = 0b0011_1111;
/// Value of the tag bits (tag mask is !CONT_MASK) of a continuation byte /// Value of the tag bits (tag mask is !CONT_MASK) of a continuation byte.
const TAG_CONT_U8: u8 = 0b1000_0000; const TAG_CONT_U8: u8 = 0b1000_0000;
/* /*