bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #87175 - inquisitivecrystal:inner-error, r=kennytm

Browse source 
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:
Yuki Okushi 2021-07-24 04:31:04 +09:00 • committed by GitHub
commit f335bca8a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
library/std/src/io/buffered/mod.rs
View file

@ -133,7 +133,6 @@ impl<W> IntoInnerError<W> {
/// ///
/// # Example /// # Example
/// ``` /// ```
/// #![feature(io_into_inner_error_parts)]
/// use std::io::{BufWriter, ErrorKind, Write}; /// use std::io::{BufWriter, ErrorKind, Write};
/// ///
/// let mut not_enough_space = [0u8; 10]; /// let mut not_enough_space = [0u8; 10];
@ -143,7 +142,7 @@ impl<W> IntoInnerError<W> {
/// let err = into_inner_err.into_error(); /// let err = into_inner_err.into_error();
/// assert_eq!(err.kind(), ErrorKind::WriteZero); /// 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 { pub fn into_error(self) -> Error {
self.1 self.1
} }
@ -156,7 +155,6 @@ impl<W> IntoInnerError<W> {
/// ///
/// # Example /// # Example
/// ``` /// ```
/// #![feature(io_into_inner_error_parts)]
/// use std::io::{BufWriter, ErrorKind, Write}; /// use std::io::{BufWriter, ErrorKind, Write};
/// ///
/// let mut not_enough_space = [0u8; 10]; /// let mut not_enough_space = [0u8; 10];
@ -167,7 +165,7 @@ impl<W> IntoInnerError<W> {
/// assert_eq!(err.kind(), ErrorKind::WriteZero); /// assert_eq!(err.kind(), ErrorKind::WriteZero);
/// assert_eq!(recovered_writer.buffer(), b"t be actually written"); /// 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) { pub fn into_parts(self) -> (Error, W) {
(self.1, self.0) (self.1, self.0)
} }