Rustup to https://github.com/rust-lang/rust/pull/64873#189
Merged
Manishearth merged 2 commits intoManishearth:masterfrom Oct 13, 2019
Merged
Rustup to https://github.com/rust-lang/rust/pull/64873#189Manishearth merged 2 commits intoManishearth:masterfrom
Manishearth merged 2 commits intoManishearth:masterfrom
Conversation
`report_time` was renamed to `time_options` and is now an `Option`.
Contributor
Author
|
The PR fails because rust-lang/rust#64873 is not in a nightly yet. Since CI here is using nightly rust, we would have to wait until the next nightly for a green build. |
Contributor
Author
Contributor
Author
|
Fixing the merge conflict, one sec 😅 |
Contributor
Author
|
oh, you did it, thanks! =) |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
report_timewas renamed totime_optionsand is now anOption.First step of fixing Clippy and Miri toolstate after rust-lang/rust#64873