Rollup merge of #31345 - kamalmarhubi:book-docs-special-section-errors, r=steveklabnik

This matches the usage in the standard library's documentation.
This commit is contained in:
Steve Klabnik 2016-02-02 00:32:19 -05:00
commit 5f0d8ea1bd
10 changed files with 19 additions and 19 deletions

View File

@ -118,7 +118,7 @@ least. If your function has a non-trivial contract like this, that is
detected/enforced by panics, documenting it is very important.
```rust
/// # Failures
/// # Errors
# fn foo() {}
```

View File

@ -1692,7 +1692,7 @@ impl str {
///
/// [`FromStr`]: str/trait.FromStr.html
///
/// # Failure
/// # Errors
///
/// Will return `Err` if it's not possible to parse this string slice into
/// the desired type.

View File

@ -433,7 +433,7 @@ impl String {
///
/// [`str::from_utf8()`]: ../str/fn.from_utf8.html
///
/// # Failure
/// # Errors
///
/// Returns `Err` if the slice is not UTF-8 with a description as to why the
/// provided bytes are not UTF-8. The vector you moved in is also included.

View File

@ -188,7 +188,7 @@ impl Utf8Error {
/// it, this function is one way to have a stack-allocated string. There is
/// an example of this in the examples section below.
///
/// # Failure
/// # Errors
///
/// Returns `Err` if the slice is not UTF-8 with a description as to why the
/// provided slice is not UTF-8.

View File

@ -194,7 +194,7 @@ impl char {
/// * `a-z`
/// * `A-Z`
///
/// # Failure
/// # Errors
///
/// Returns `None` if the `char` does not refer to a digit in the given radix.
///

View File

@ -70,7 +70,7 @@ pub struct Metadata(fs_imp::FileAttr);
/// information like the entry's path and possibly other metadata can be
/// learned.
///
/// # Failure
/// # Errors
///
/// This `io::Result` will be an `Err` if there's some sort of intermittent
/// IO error during iteration.

View File

@ -129,7 +129,7 @@ impl Condvar {
/// the predicate must always be checked each time this function returns to
/// protect against spurious wakeups.
///
/// # Failure
/// # Errors
///
/// This function will return an error if the mutex being waited on is
/// poisoned when this thread re-acquires the lock. For more information,

View File

@ -205,7 +205,7 @@ impl<T: ?Sized> Mutex<T> {
/// held. An RAII guard is returned to allow scoped unlock of the lock. When
/// the guard goes out of scope, the mutex will be unlocked.
///
/// # Failure
/// # Errors
///
/// If another user of this mutex panicked while holding the mutex, then
/// this call will return an error once the mutex is acquired.
@ -223,7 +223,7 @@ impl<T: ?Sized> Mutex<T> {
///
/// This function does not block.
///
/// # Failure
/// # Errors
///
/// If another user of this mutex panicked while holding the mutex, then
/// this call will return failure if the mutex would otherwise be
@ -250,7 +250,7 @@ impl<T: ?Sized> Mutex<T> {
/// Consumes this mutex, returning the underlying data.
///
/// # Failure
/// # Errors
///
/// If another user of this mutex panicked while holding the mutex, then
/// this call will return an error instead.
@ -280,7 +280,7 @@ impl<T: ?Sized> Mutex<T> {
/// Since this call borrows the `Mutex` mutably, no actual locking needs to
/// take place---the mutable borrow statically guarantees no locks exist.
///
/// # Failure
/// # Errors
///
/// If another user of this mutex panicked while holding the mutex, then
/// this call will return an error instead.

View File

@ -169,7 +169,7 @@ impl<T: ?Sized> RwLock<T> {
/// Returns an RAII guard which will release this thread's shared access
/// once it is dropped.
///
/// # Failure
/// # Errors
///
/// This function will return an error if the RwLock is poisoned. An RwLock
/// is poisoned whenever a writer panics while holding an exclusive lock.
@ -192,7 +192,7 @@ impl<T: ?Sized> RwLock<T> {
/// This function does not provide any guarantees with respect to the ordering
/// of whether contentious readers or writers will acquire the lock first.
///
/// # Failure
/// # Errors
///
/// This function will return an error if the RwLock is poisoned. An RwLock
/// is poisoned whenever a writer panics while holding an exclusive lock. An
@ -217,7 +217,7 @@ impl<T: ?Sized> RwLock<T> {
/// Returns an RAII guard which will drop the write access of this rwlock
/// when dropped.
///
/// # Failure
/// # Errors
///
/// This function will return an error if the RwLock is poisoned. An RwLock
/// is poisoned whenever a writer panics while holding an exclusive lock.
@ -240,7 +240,7 @@ impl<T: ?Sized> RwLock<T> {
/// This function does not provide any guarantees with respect to the ordering
/// of whether contentious readers or writers will acquire the lock first.
///
/// # Failure
/// # Errors
///
/// This function will return an error if the RwLock is poisoned. An RwLock
/// is poisoned whenever a writer panics while holding an exclusive lock. An
@ -269,7 +269,7 @@ impl<T: ?Sized> RwLock<T> {
/// Consumes this `RwLock`, returning the underlying data.
///
/// # Failure
/// # Errors
///
/// This function will return an error if the RwLock is poisoned. An RwLock
/// is poisoned whenever a writer panics while holding an exclusive lock. An
@ -301,7 +301,7 @@ impl<T: ?Sized> RwLock<T> {
/// Since this call borrows the `RwLock` mutably, no actual locking needs to
/// take place---the mutable borrow statically guarantees no locks exist.
///
/// # Failure
/// # Errors
///
/// This function will return an error if the RwLock is poisoned. An RwLock
/// is poisoned whenever a writer panics while holding an exclusive lock. An

View File

@ -78,7 +78,7 @@ impl<T> ReentrantMutex<T> {
/// calling this method already holds the lock, the call shall succeed without
/// blocking.
///
/// # Failure
/// # Errors
///
/// If another user of this mutex panicked while holding the mutex, then
/// this call will return failure if the mutex would otherwise be
@ -95,7 +95,7 @@ impl<T> ReentrantMutex<T> {
///
/// This function does not block.
///
/// # Failure
/// # Errors
///
/// If another user of this mutex panicked while holding the mutex, then
/// this call will return failure if the mutex would otherwise be