mirror of
https://github.com/rust-lang/rust.git
synced 2026-05-03 17:35:28 +03:00
Rollup merge of #87175 - inquisitivecrystal:inner-error, r=kennytm
Stabilize `into_parts()` and `into_error()` This stabilizes `IntoInnerError`'s `into_parts()` and `into_error()` methods, currently gated behind the `io_into_inner_error_parts` feature. The FCP has [already completed.](https://github.com/rust-lang/rust/issues/79704#issuecomment-880652967) Closes #79704.
This commit is contained in:
@@ -133,7 +133,6 @@ pub fn into_inner(self) -> W {
|
||||
///
|
||||
/// # Example
|
||||
/// ```
|
||||
/// #![feature(io_into_inner_error_parts)]
|
||||
/// use std::io::{BufWriter, ErrorKind, Write};
|
||||
///
|
||||
/// let mut not_enough_space = [0u8; 10];
|
||||
@@ -143,7 +142,7 @@ pub fn into_inner(self) -> W {
|
||||
/// let err = into_inner_err.into_error();
|
||||
/// assert_eq!(err.kind(), ErrorKind::WriteZero);
|
||||
/// ```
|
||||
#[unstable(feature = "io_into_inner_error_parts", issue = "79704")]
|
||||
#[stable(feature = "io_into_inner_error_parts", since = "1.55.0")]
|
||||
pub fn into_error(self) -> Error {
|
||||
self.1
|
||||
}
|
||||
@@ -156,7 +155,6 @@ pub fn into_error(self) -> Error {
|
||||
///
|
||||
/// # Example
|
||||
/// ```
|
||||
/// #![feature(io_into_inner_error_parts)]
|
||||
/// use std::io::{BufWriter, ErrorKind, Write};
|
||||
///
|
||||
/// let mut not_enough_space = [0u8; 10];
|
||||
@@ -167,7 +165,7 @@ pub fn into_error(self) -> Error {
|
||||
/// assert_eq!(err.kind(), ErrorKind::WriteZero);
|
||||
/// assert_eq!(recovered_writer.buffer(), b"t be actually written");
|
||||
/// ```
|
||||
#[unstable(feature = "io_into_inner_error_parts", issue = "79704")]
|
||||
#[stable(feature = "io_into_inner_error_parts", since = "1.55.0")]
|
||||
pub fn into_parts(self) -> (Error, W) {
|
||||
(self.1, self.0)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user