diff options
| author | Andy Russell <arussell123@gmail.com> | 2018-11-16 16:22:06 -0500 |
|---|---|---|
| committer | Andy Russell <arussell123@gmail.com> | 2018-12-07 12:54:11 -0500 |
| commit | 2f6226518bd5085896a0f27cfd3ea396367ecd50 (patch) | |
| tree | 713f018b5a2028f682ac9fcf84688022e5f6acfe /src/libsyntax/source_map.rs | |
| parent | 1c3236afc3560b5781acf942a4746aeb11e5374e (diff) | |
| download | rust-2f6226518bd5085896a0f27cfd3ea396367ecd50.tar.gz rust-2f6226518bd5085896a0f27cfd3ea396367ecd50.zip | |
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/libsyntax/source_map.rs')
| -rw-r--r-- | src/libsyntax/source_map.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/libsyntax/source_map.rs b/src/libsyntax/source_map.rs index ee60d2dd615..45008129e83 100644 --- a/src/libsyntax/source_map.rs +++ b/src/libsyntax/source_map.rs @@ -31,7 +31,7 @@ use std::path::{Path, PathBuf}; use std::env; use std::fs; -use std::io::{self, Read}; +use std::io; use errors::SourceMapper; /// Return the span itself if it doesn't come from a macro expansion, @@ -96,9 +96,7 @@ impl FileLoader for RealFileLoader { } fn read_file(&self, path: &Path) -> io::Result<String> { - let mut src = String::new(); - fs::File::open(path)?.read_to_string(&mut src)?; - Ok(src) + fs::read_to_string(path) } } |
