提交 69607614 编写于 作者: B bors

Auto merge of #49422 - mbrubeck:fs_read, r=TimNN

Stabilize fs::read and fs::write

As discussed in https://github.com/rust-lang/rust/issues/46588#issuecomment-373956283
...@@ -251,8 +251,6 @@ fn initial_buffer_size(file: &File) -> usize { ...@@ -251,8 +251,6 @@ fn initial_buffer_size(file: &File) -> usize {
/// # Examples /// # Examples
/// ///
/// ```no_run /// ```no_run
/// #![feature(fs_read_write)]
///
/// use std::fs; /// use std::fs;
/// use std::net::SocketAddr; /// use std::net::SocketAddr;
/// ///
...@@ -261,7 +259,7 @@ fn initial_buffer_size(file: &File) -> usize { ...@@ -261,7 +259,7 @@ fn initial_buffer_size(file: &File) -> usize {
/// Ok(()) /// Ok(())
/// } /// }
/// ``` /// ```
#[unstable(feature = "fs_read_write", issue = "46588")] #[stable(feature = "fs_read_write_bytes", since = "1.27.0")]
pub fn read<P: AsRef<Path>>(path: P) -> io::Result<Vec<u8>> { pub fn read<P: AsRef<Path>>(path: P) -> io::Result<Vec<u8>> {
let mut file = File::open(path)?; let mut file = File::open(path)?;
let mut bytes = Vec::with_capacity(initial_buffer_size(&file)); let mut bytes = Vec::with_capacity(initial_buffer_size(&file));
...@@ -325,8 +323,6 @@ pub fn read_string<P: AsRef<Path>>(path: P) -> io::Result<String> { ...@@ -325,8 +323,6 @@ pub fn read_string<P: AsRef<Path>>(path: P) -> io::Result<String> {
/// # Examples /// # Examples
/// ///
/// ```no_run /// ```no_run
/// #![feature(fs_read_write)]
///
/// use std::fs; /// use std::fs;
/// ///
/// fn main() -> std::io::Result<()> { /// fn main() -> std::io::Result<()> {
...@@ -334,7 +330,7 @@ pub fn read_string<P: AsRef<Path>>(path: P) -> io::Result<String> { ...@@ -334,7 +330,7 @@ pub fn read_string<P: AsRef<Path>>(path: P) -> io::Result<String> {
/// Ok(()) /// Ok(())
/// } /// }
/// ``` /// ```
#[unstable(feature = "fs_read_write", issue = "46588")] #[stable(feature = "fs_read_write_bytes", since = "1.27.0")]
pub fn write<P: AsRef<Path>, C: AsRef<[u8]>>(path: P, contents: C) -> io::Result<()> { pub fn write<P: AsRef<Path>, C: AsRef<[u8]>>(path: P, contents: C) -> io::Result<()> {
File::create(path)?.write_all(contents.as_ref()) File::create(path)?.write_all(contents.as_ref())
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册