diff options
| author | bors <bors@rust-lang.org> | 2018-12-07 23:26:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-12-07 23:26:14 +0000 |
| commit | 0a7798079608b4ff014471ae64b6c8201aa59cdf (patch) | |
| tree | d7b77b0fc5a6446207132b666952751aecf40a51 /src/libcore | |
| parent | 4a45578bc58ff262864f72680cc02e83f5d2f5b3 (diff) | |
| parent | 2f6226518bd5085896a0f27cfd3ea396367ecd50 (diff) | |
| download | rust-0a7798079608b4ff014471ae64b6c8201aa59cdf.tar.gz rust-0a7798079608b4ff014471ae64b6c8201aa59cdf.zip | |
Auto merge of #56258 - euclio:fs-read-write, r=euclio
use top level `fs` functions where appropriate This commit replaces many usages of `File::open` and reading or writing with `fs::read_to_string`, `fs::read` and `fs::write`. This reduces code complexity, and will improve performance for most reads, since the functions allocate the buffer to be the size of the file. I believe that this commit will not impact behavior in any way, so some matches will check the error kind in case the file was not valid UTF-8. Some of these cases may not actually care about the error.
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/convert.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/libcore/convert.rs b/src/libcore/convert.rs index dbc28ef7cf6..2d4813718f4 100644 --- a/src/libcore/convert.rs +++ b/src/libcore/convert.rs @@ -327,7 +327,8 @@ pub trait Into<T>: Sized { /// An example usage for error handling: /// /// ``` -/// use std::io::{self, Read}; +/// use std::fs; +/// use std::io; /// use std::num; /// /// enum CliError { @@ -348,9 +349,7 @@ pub trait Into<T>: Sized { /// } /// /// fn open_and_parse_file(file_name: &str) -> Result<i32, CliError> { -/// let mut file = std::fs::File::open("test")?; -/// let mut contents = String::new(); -/// file.read_to_string(&mut contents)?; +/// let mut contents = fs::read_to_string(&file_name)?; /// let num: i32 = contents.trim().parse()?; /// Ok(num) /// } |
