From be82f1a4a9e32f10572937734b457841976880ef Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 1 May 2021 00:38:01 +0100
Subject: [PATCH 1/2] Stabilise BufWriter::into_raw_parts
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
library/std/src/io/buffered/bufwriter.rs | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/library/std/src/io/buffered/bufwriter.rs b/library/std/src/io/buffered/bufwriter.rs
index 80f98bbbad366..83066450dd78c 100644
--- a/library/std/src/io/buffered/bufwriter.rs
+++ b/library/std/src/io/buffered/bufwriter.rs
@@ -314,7 +314,6 @@ impl<W: Write> BufWriter<W> {
/// # Examples
///
/// ```
- /// #![feature(bufwriter_into_raw_parts)]
/// use std::io::{BufWriter, Write};
///
/// let mut buffer = [0u8; 10];
@@ -325,7 +324,7 @@ impl<W: Write> BufWriter<W> {
/// assert_eq!(recovered_writer.len(), 0);
/// assert_eq!(&buffered_data.unwrap(), b"ata");
/// ```
- #[unstable(feature = "bufwriter_into_raw_parts", issue = "80690")]
+ #[stable(feature = "bufwriter_into_raw_parts", since = "1.53.0")]
pub fn into_raw_parts(mut self) -> (W, Result<Vec<u8>, WriterPanicked>) {
let buf = mem::take(&mut self.buf);
let buf = if !self.panicked { Ok(buf) } else { Err(WriterPanicked { buf }) };
@@ -333,14 +332,13 @@ impl<W: Write> BufWriter<W> {
}
}
-#[unstable(feature = "bufwriter_into_raw_parts", issue = "80690")]
+#[stable(feature = "bufwriter_into_raw_parts", since = "1.53.0")]
/// Error returned for the buffered data from `BufWriter::into_raw_parts`, when the underlying
/// writer has previously panicked. Contains the (possibly partly written) buffered data.
///
/// # Example
///
/// ```
-/// #![feature(bufwriter_into_raw_parts)]
/// use std::io::{self, BufWriter, Write};
/// use std::panic::{catch_unwind, AssertUnwindSafe};
///
@@ -367,7 +365,7 @@ pub struct WriterPanicked {
impl WriterPanicked {
/// Returns the perhaps-unwritten data. Some of this data may have been written by the
/// panicking call(s) to the underlying writer, so simply writing it again is not a good idea.
- #[unstable(feature = "bufwriter_into_raw_parts", issue = "80690")]
+ #[stable(feature = "bufwriter_into_raw_parts", since = "1.53.0")]
pub fn into_inner(self) -> Vec<u8> {
self.buf
}
@@ -376,7 +374,7 @@ impl WriterPanicked {
"BufWriter inner writer panicked, what data remains unwritten is not known";
}
-#[unstable(feature = "bufwriter_into_raw_parts", issue = "80690")]
+#[stable(feature = "bufwriter_into_raw_parts", since = "1.53.0")]
impl error::Error for WriterPanicked {
#[allow(deprecated, deprecated_in_future)]
fn description(&self) -> &str {
@@ -384,14 +382,14 @@ impl error::Error for WriterPanicked {
}
}
-#[unstable(feature = "bufwriter_into_raw_parts", issue = "80690")]
+#[stable(feature = "bufwriter_into_raw_parts", since = "1.53.0")]
impl fmt::Display for WriterPanicked {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "{}", Self::DESCRIPTION)
}
}
-#[unstable(feature = "bufwriter_into_raw_parts", issue = "80690")]
+#[stable(feature = "bufwriter_into_raw_parts", since = "1.53.0")]
impl fmt::Debug for WriterPanicked {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.debug_struct("WriterPanicked")
From 2aed059a2a6d783907787cfe7ef95d4a544db14e Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 1 May 2021 00:00:11 +0100
Subject: [PATCH 2/2] Stabilise BufWriter's IntoInnerError::into_parts and
::into_error
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
library/std/src/io/buffered/mod.rs | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/library/std/src/io/buffered/mod.rs b/library/std/src/io/buffered/mod.rs
index 65497817f8160..fec46653f9663 100644
--- a/library/std/src/io/buffered/mod.rs
+++ b/library/std/src/io/buffered/mod.rs
@@ -133,7 +133,6 @@ impl<W> IntoInnerError<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 @@ impl<W> IntoInnerError<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.53.0")]
pub fn into_error(self) -> Error {
self.1
}
@@ -156,7 +155,6 @@ impl<W> IntoInnerError<W> {
///
/// # Example
/// ```
- /// #![feature(io_into_inner_error_parts)]
/// use std::io::{BufWriter, ErrorKind, Write};
///
/// let mut not_enough_space = [0u8; 10];
@@ -167,7 +165,7 @@ impl<W> IntoInnerError<W> {
/// 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.53.0")]
pub fn into_parts(self) -> (Error, W) {
(self.1, self.0)
}