Skip to content

Commit e78629e

Browse files
committed
Rollup merge of #30274 - tshepang:mere-renames, r=steveklabnik
2 parents 1f0f7d6 + 33d43c1 commit e78629e

File tree

4 files changed

+5
-52
lines changed

4 files changed

+5
-52
lines changed

src/libcollections/vec.rs

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -920,21 +920,7 @@ impl<T: Clone> Vec<T> {
920920
}
921921
}
922922

923-
/// Appends all elements in a slice to the `Vec`.
924-
///
925-
/// Iterates over the slice `other`, clones each element, and then appends
926-
/// it to this `Vec`. The `other` vector is traversed in-order.
927-
///
928-
/// # Examples
929-
///
930-
/// ```
931-
/// #![feature(vec_push_all)]
932-
/// #![allow(deprecated)]
933-
///
934-
/// let mut vec = vec![1];
935-
/// vec.push_all(&[2, 3, 4]);
936-
/// assert_eq!(vec, [1, 2, 3, 4]);
937-
/// ```
923+
#[allow(missing_docs)]
938924
#[inline]
939925
#[unstable(feature = "vec_push_all",
940926
reason = "likely to be replaced by a more optimized extend",

src/libcore/iter.rs

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1893,21 +1893,7 @@ pub trait Iterator {
18931893
.map(|(_, x)| x)
18941894
}
18951895

1896-
/// Returns the element that gives the maximum value from the
1897-
/// specified function.
1898-
///
1899-
/// Returns the rightmost element if the comparison determines two elements
1900-
/// to be equally maximum.
1901-
///
1902-
/// # Examples
1903-
///
1904-
/// ```
1905-
/// #![feature(iter_cmp)]
1906-
/// #![allow(deprecated)]
1907-
///
1908-
/// let a = [-3_i32, 0, 1, 5, -10];
1909-
/// assert_eq!(*a.iter().max_by(|x| x.abs()).unwrap(), -10);
1910-
/// ```
1896+
#[allow(missing_docs)]
19111897
#[inline]
19121898
#[unstable(feature = "iter_cmp",
19131899
reason = "may want to produce an Ordering directly; see #15311",
@@ -1945,22 +1931,8 @@ pub trait Iterator {
19451931
.map(|(_, x)| x)
19461932
}
19471933

1948-
/// Returns the element that gives the minimum value from the
1949-
/// specified function.
1950-
///
1951-
/// Returns the latest element if the comparison determines two elements
1952-
/// to be equally minimum.
1953-
///
1954-
/// # Examples
1955-
///
1956-
/// ```
1957-
/// #![feature(iter_cmp)]
1958-
/// #![allow(deprecated)]
1959-
///
1960-
/// let a = [-3_i32, 0, 1, 5, -10];
1961-
/// assert_eq!(*a.iter().min_by(|x| x.abs()).unwrap(), 0);
1962-
/// ```
19631934
#[inline]
1935+
#[allow(missing_docs)]
19641936
#[unstable(feature = "iter_cmp",
19651937
reason = "may want to produce an Ordering directly; see #15311",
19661938
issue = "27724")]

src/libstd/io/error.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -150,12 +150,7 @@ pub enum ErrorKind {
150150
#[stable(feature = "rust1", since = "1.0.0")]
151151
Other,
152152

153-
/// An error returned when an operation could not be completed because an
154-
/// "end of file" was reached prematurely.
155-
///
156-
/// This typically means that an operation could only succeed if it read a
157-
/// particular number of bytes but only a smaller number of bytes could be
158-
/// read.
153+
#[allow(missing_docs)]
159154
#[unstable(feature = "read_exact_old", reason = "recently added",
160155
issue = "0")]
161156
#[rustc_deprecated(since = "1.6.0", reason = "renamed to UnexpectedEof")]

src/libstd/io/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ pub trait Read {
576576
/// will continue.
577577
///
578578
/// If this function encounters an "end of file" before completely filling
579-
/// the buffer, it returns an error of the kind `ErrorKind::UnexpectedEOF`.
579+
/// the buffer, it returns an error of the kind `ErrorKind::UnexpectedEof`.
580580
/// The contents of `buf` are unspecified in this case.
581581
///
582582
/// If any other read error is encountered then this function immediately

0 commit comments

Comments
 (0)