about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2015-12-09 00:01:18 -0500
committerSteve Klabnik <steve@steveklabnik.com>2015-12-09 00:01:18 -0500
commite78629eb5a6bcaf81588814faf36059ea8a175ec (patch)
treee5e3dd05018a2a402caa2a1ab1e6bf304564bc5b /src
parent1f0f7d6fbaa807f93ade06be07a328febd28db9e (diff)
parent33d43c1e3468c8245f5f096d06760dac318399f7 (diff)
downloadrust-e78629eb5a6bcaf81588814faf36059ea8a175ec.tar.gz
rust-e78629eb5a6bcaf81588814faf36059ea8a175ec.zip
Rollup merge of #30274 - tshepang:mere-renames, r=steveklabnik
Diffstat (limited to 'src')
-rw-r--r--src/libcollections/vec.rs16
-rw-r--r--src/libcore/iter.rs32
-rw-r--r--src/libstd/io/error.rs7
-rw-r--r--src/libstd/io/mod.rs2
4 files changed, 5 insertions, 52 deletions
diff --git a/src/libcollections/vec.rs b/src/libcollections/vec.rs
index 89b1b99cfa3..ddad7533a08 100644
--- a/src/libcollections/vec.rs
+++ b/src/libcollections/vec.rs
@@ -920,21 +920,7 @@ impl<T: Clone> Vec<T> {
         }
     }
 
-    /// Appends all elements in a slice to the `Vec`.
-    ///
-    /// Iterates over the slice `other`, clones each element, and then appends
-    /// it to this `Vec`. The `other` vector is traversed in-order.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// #![feature(vec_push_all)]
-    /// #![allow(deprecated)]
-    ///
-    /// let mut vec = vec![1];
-    /// vec.push_all(&[2, 3, 4]);
-    /// assert_eq!(vec, [1, 2, 3, 4]);
-    /// ```
+    #[allow(missing_docs)]
     #[inline]
     #[unstable(feature = "vec_push_all",
                reason = "likely to be replaced by a more optimized extend",
diff --git a/src/libcore/iter.rs b/src/libcore/iter.rs
index 86c00a254ca..959b6a97c5c 100644
--- a/src/libcore/iter.rs
+++ b/src/libcore/iter.rs
@@ -1893,21 +1893,7 @@ pub trait Iterator {
             .map(|(_, x)| x)
     }
 
-    /// Returns the element that gives the maximum value from the
-    /// specified function.
-    ///
-    /// Returns the rightmost element if the comparison determines two elements
-    /// to be equally maximum.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// #![feature(iter_cmp)]
-    /// #![allow(deprecated)]
-    ///
-    /// let a = [-3_i32, 0, 1, 5, -10];
-    /// assert_eq!(*a.iter().max_by(|x| x.abs()).unwrap(), -10);
-    /// ```
+    #[allow(missing_docs)]
     #[inline]
     #[unstable(feature = "iter_cmp",
                reason = "may want to produce an Ordering directly; see #15311",
@@ -1945,22 +1931,8 @@ pub trait Iterator {
             .map(|(_, x)| x)
     }
 
-    /// Returns the element that gives the minimum value from the
-    /// specified function.
-    ///
-    /// Returns the latest element if the comparison determines two elements
-    /// to be equally minimum.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// #![feature(iter_cmp)]
-    /// #![allow(deprecated)]
-    ///
-    /// let a = [-3_i32, 0, 1, 5, -10];
-    /// assert_eq!(*a.iter().min_by(|x| x.abs()).unwrap(), 0);
-    /// ```
     #[inline]
+    #[allow(missing_docs)]
     #[unstable(feature = "iter_cmp",
                reason = "may want to produce an Ordering directly; see #15311",
                issue = "27724")]
diff --git a/src/libstd/io/error.rs b/src/libstd/io/error.rs
index 4af9596d6d0..1ff8f572a7f 100644
--- a/src/libstd/io/error.rs
+++ b/src/libstd/io/error.rs
@@ -150,12 +150,7 @@ pub enum ErrorKind {
     #[stable(feature = "rust1", since = "1.0.0")]
     Other,
 
-    /// An error returned when an operation could not be completed because an
-    /// "end of file" was reached prematurely.
-    ///
-    /// This typically means that an operation could only succeed if it read a
-    /// particular number of bytes but only a smaller number of bytes could be
-    /// read.
+    #[allow(missing_docs)]
     #[unstable(feature = "read_exact_old", reason = "recently added",
                issue = "0")]
     #[rustc_deprecated(since = "1.6.0", reason = "renamed to UnexpectedEof")]
diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs
index e957297bf62..efe40cf07c1 100644
--- a/src/libstd/io/mod.rs
+++ b/src/libstd/io/mod.rs
@@ -576,7 +576,7 @@ pub trait Read {
     /// will continue.
     ///
     /// If this function encounters an "end of file" before completely filling
-    /// the buffer, it returns an error of the kind `ErrorKind::UnexpectedEOF`.
+    /// the buffer, it returns an error of the kind `ErrorKind::UnexpectedEof`.
     /// The contents of `buf` are unspecified in this case.
     ///
     /// If any other read error is encountered then this function immediately