Use the new fs_read_write functions in rustc internals #47328
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @pnkfelix (rust_highfive has picked a reviewer for you, use r? to override) |
kennytm
added
the
S-waiting-on-review
sfackler
reviewed
Jan 10, 2018
src/librustdoc/html/render.rs
Outdated
| let mut f = try_err!(File::open(css), css); | ||
|
|
||
| try_err!(f.read_to_string(&mut content), css); | ||
| let content = try_err!(fs::read(&css), &css); |
There was a problem hiding this comment.
This should be read_string, right?
There was a problem hiding this comment.
The original used read_to_string but there's no reason to create a string here; it's just copying the contents to a new file. Actually, this should use fs::copy...
sfackler
reviewed
Jan 10, 2018
src/librustdoc/html/render.rs
Outdated
| let mut contents = Vec::new(); | ||
| File::open(&p).and_then(|mut f| f.read_to_end(&mut contents))?; | ||
|
|
||
| let contents = fs::read(&p)?; |
|
Addressed review comments. |
|
@bors r+ |
|
📌 Commit 3f9c057 has been approved by |
kennytm
added a commit
to kennytm/rust
that referenced
this pull request
Jan 11, 2018
Use the new fs_read_write functions in rustc internals Uses `fs::read` and `fs::write` (added by rust-lang#45837) where appropriate, to simplify code and dog-food these new APIs. This also improves performance, when combined with rust-lang#47324.
kennytm
added a commit
to kennytm/rust
that referenced
this pull request
Jan 11, 2018
Use the new fs_read_write functions in rustc internals Uses `fs::read` and `fs::write` (added by rust-lang#45837) where appropriate, to simplify code and dog-food these new APIs. This also improves performance, when combined with rust-lang#47324.
kennytm
added a commit
to kennytm/rust
that referenced
this pull request
Jan 12, 2018
Use the new fs_read_write functions in rustc internals Uses `fs::read` and `fs::write` (added by rust-lang#45837) where appropriate, to simplify code and dog-food these new APIs. This also improves performance, when combined with rust-lang#47324.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uses
fs::readandfs::write(added by #45837) where appropriate, to simplify code and dog-food these new APIs. This also improves performance, when combined with #47324.