Rename fs::read_string to read_to_string and stabilize #49522
Merged
Conversation
This file contains 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
|
Set the stabilization attribute to 1.26.0 because it hasn't branched to beta yet. It will need to be updated if the branch happens before this lands. |
XAMPPRocky
added
C-enhancement
shepmaster
added
the
S-waiting-on-review
SimonSapin
reviewed
Mar 30, 2018
| @@ -244,7 +244,8 @@ fn get_resident() -> Option<usize> { | |||
| use std::fs; | |||
|
|
|||
| let field = 1; | |||
| let contents = fs::read_string("/proc/self/statm").ok()?; | |||
| let contents = fs::read("/proc/self/statm").ok()?; | |||
| let contents = String::from_utf8(contents).ok()?; | |||
There was a problem hiding this comment.
Why this change? Other than this r=me
There was a problem hiding this comment.
Using the new read_to_string function here would break bootstrapping from the previous release, where that name didn't exist. This seemed simpler than doing some sort of conditional import based on cfg(stage0).
|
@bors: r+ |
|
📌 Commit 6b7627f has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Mar 31, 2018
Rename fs::read_string to read_to_string and stabilize As approved in #46588 (comment) Closes #46588.
|
💔 Test failed - status-appveyor |
bors
added
S-waiting-on-review
|
Hit the three hour limit. |
|
@bors: retry |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Apr 1, 2018
Rename fs::read_string to read_to_string and stabilize As approved in #46588 (comment) Closes #46588.
|
☀️ Test successful - status-appveyor, status-travis |
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.
As approved in #46588 (comment)
Closes #46588.