From 341c85648c612532d757afb3cafa63ebaa3693db Mon Sep 17 00:00:00 2001
From: John Millikin <john@john-millikin.com>
Date: Wed, 8 Nov 2023 09:12:01 +0900
Subject: [PATCH] Move `BorrowedBuf` and `BorrowedCursor` from `std:io` to
`core::io`
Assigned new feature name `core_io_borrowed_buf` to distinguish from the
`Read::read_buf` functionality in `std::io`.
---
compiler/rustc_span/src/lib.rs | 1 +
.../src/io/borrowed_buf.rs} | 19 +------------------
library/core/src/io/mod.rs | 6 ++++++
library/core/src/lib.rs | 2 ++
.../tests/io/borrowed_buf.rs} | 4 ++--
library/core/tests/io/mod.rs | 1 +
library/core/tests/lib.rs | 2 ++
library/std/src/io/impls.rs | 14 ++++++++++++++
library/std/src/io/mod.rs | 3 +--
library/std/src/lib.rs | 1 +
10 files changed, 31 insertions(+), 22 deletions(-)
rename library/{std/src/io/readbuf.rs => core/src/io/borrowed_buf.rs} (96%)
create mode 100644 library/core/src/io/mod.rs
rename library/{std/src/io/readbuf/tests.rs => core/tests/io/borrowed_buf.rs} (98%)
create mode 100644 library/core/tests/io/mod.rs
diff --git a/compiler/rustc_span/src/lib.rs b/compiler/rustc_span/src/lib.rs
index fc13bdff36f5d..489c8d1892657 100644
--- a/compiler/rustc_span/src/lib.rs
+++ b/compiler/rustc_span/src/lib.rs
@@ -24,6 +24,7 @@
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
#![feature(array_windows)]
#![feature(cfg_match)]
+#![feature(core_io_borrowed_buf)]
#![feature(if_let_guard)]
#![feature(let_chains)]
#![feature(min_specialization)]
diff --git a/library/std/src/io/readbuf.rs b/library/core/src/io/borrowed_buf.rs
similarity index 96%
rename from library/std/src/io/readbuf.rs
rename to library/core/src/io/borrowed_buf.rs
index 95044de2a09e1..fe25cac280fe3 100644
--- a/library/std/src/io/readbuf.rs
+++ b/library/core/src/io/borrowed_buf.rs
@@ -1,10 +1,6 @@
-#![unstable(feature = "read_buf", issue = "78485")]
-
-#[cfg(test)]
-mod tests;
+#![unstable(feature = "core_io_borrowed_buf", issue = "117693")]
use crate::fmt::{self, Debug, Formatter};
-use crate::io::{Result, Write};
use crate::mem::{self, MaybeUninit};
use crate::{cmp, ptr};
@@ -303,16 +299,3 @@ impl<'a> BorrowedCursor<'a> {
self.buf.filled += buf.len();
}
}
-
-impl<'a> Write for BorrowedCursor<'a> {
- fn write(&mut self, buf: &[u8]) -> Result<usize> {
- let amt = cmp::min(buf.len(), self.capacity());
- self.append(&buf[..amt]);
- Ok(amt)
- }
-
- #[inline]
- fn flush(&mut self) -> Result<()> {
- Ok(())
- }
-}
diff --git a/library/core/src/io/mod.rs b/library/core/src/io/mod.rs
new file mode 100644
index 0000000000000..2f20180cdc9a2
--- /dev/null
+++ b/library/core/src/io/mod.rs
@@ -0,0 +1,6 @@
+//! Traits, helpers, and type definitions for core I/O functionality.
+
+mod borrowed_buf;
+
+#[unstable(feature = "core_io_borrowed_buf", issue = "117693")]
+pub use self::borrowed_buf::{BorrowedBuf, BorrowedCursor};
diff --git a/library/core/src/lib.rs b/library/core/src/lib.rs
index de643fb333efe..5a6d242a7298e 100644
--- a/library/core/src/lib.rs
+++ b/library/core/src/lib.rs
@@ -369,6 +369,8 @@ pub mod async_iter;
pub mod cell;
pub mod char;
pub mod ffi;
+#[unstable(feature = "core_io_borrowed_buf", issue = "117693")]
+pub mod io;
pub mod iter;
pub mod net;
pub mod option;
diff --git a/library/std/src/io/readbuf/tests.rs b/library/core/tests/io/borrowed_buf.rs
similarity index 98%
rename from library/std/src/io/readbuf/tests.rs
rename to library/core/tests/io/borrowed_buf.rs
index 89a2f6b2271bd..69511e49acdbc 100644
--- a/library/std/src/io/readbuf/tests.rs
+++ b/library/core/tests/io/borrowed_buf.rs
@@ -1,5 +1,5 @@
-use super::BorrowedBuf;
-use crate::mem::MaybeUninit;
+use core::io::BorrowedBuf;
+use core::mem::MaybeUninit;
/// Test that BorrowedBuf has the correct numbers when created with new
#[test]
diff --git a/library/core/tests/io/mod.rs b/library/core/tests/io/mod.rs
new file mode 100644
index 0000000000000..a24893a525a9d
--- /dev/null
+++ b/library/core/tests/io/mod.rs
@@ -0,0 +1 @@
+mod borrowed_buf;
diff --git a/library/core/tests/lib.rs b/library/core/tests/lib.rs
index df7b34ce73b42..168b47dc99cc6 100644
--- a/library/core/tests/lib.rs
+++ b/library/core/tests/lib.rs
@@ -23,6 +23,7 @@
#![feature(const_likely)]
#![feature(const_location_fields)]
#![feature(core_intrinsics)]
+#![feature(core_io_borrowed_buf)]
#![feature(core_private_bignum)]
#![feature(core_private_diy_float)]
#![feature(dec2flt)]
@@ -135,6 +136,7 @@ mod fmt;
mod future;
mod hash;
mod intrinsics;
+mod io;
mod iter;
mod lazy;
#[cfg(test)]
diff --git a/library/std/src/io/impls.rs b/library/std/src/io/impls.rs
index f438325560f54..256b043a60971 100644
--- a/library/std/src/io/impls.rs
+++ b/library/std/src/io/impls.rs
@@ -528,3 +528,17 @@ impl<A: Allocator> Write for VecDeque<u8, A> {
Ok(())
}
}
+
+#[unstable(feature = "read_buf", issue = "78485")]
+impl<'a> io::Write for core::io::BorrowedCursor<'a> {
+ fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+ let amt = cmp::min(buf.len(), self.capacity());
+ self.append(&buf[..amt]);
+ Ok(amt)
+ }
+
+ #[inline]
+ fn flush(&mut self) -> io::Result<()> {
+ Ok(())
+ }
+}
diff --git a/library/std/src/io/mod.rs b/library/std/src/io/mod.rs
index aa9a2482d2d92..7d70a0bac24fd 100644
--- a/library/std/src/io/mod.rs
+++ b/library/std/src/io/mod.rs
@@ -330,7 +330,7 @@ pub use self::{
};
#[unstable(feature = "read_buf", issue = "78485")]
-pub use self::readbuf::{BorrowedBuf, BorrowedCursor};
+pub use core::io::{BorrowedBuf, BorrowedCursor};
pub(crate) use error::const_io_error;
mod buffered;
@@ -339,7 +339,6 @@ mod cursor;
mod error;
mod impls;
pub mod prelude;
-mod readbuf;
mod stdio;
mod util;
diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs
index f57c8d4e7e282..425890122577f 100644
--- a/library/std/src/lib.rs
+++ b/library/std/src/lib.rs
@@ -310,6 +310,7 @@
// tidy-alphabetical-start
#![feature(char_internals)]
#![feature(core_intrinsics)]
+#![feature(core_io_borrowed_buf)]
#![feature(duration_constants)]
#![feature(error_generic_member_access)]
#![feature(error_in_core)]