bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

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

Browse source 
Stabilize fs::read and fs::write

As discussed in https://github.com/rust-lang/rust/issues/46588#issuecomment-373956283
This commit is contained in:
bors 2018-03-30 06:49:33 +00:00
commit 696076144d
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libstd/fs.rs
View file

@ -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 {
/// 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> {
/// # 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> {
/// 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())
} }