Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rustup to https://github.com/rust-lang/rust/pull/64873 #189

Merged
merged 2 commits into from Oct 13, 2019

Conversation

@phansch
Copy link
Contributor

phansch commented Oct 13, 2019

report_time was renamed to time_options and is now an Option.

First step of fixing Clippy and Miri toolstate after rust-lang/rust#64873

`report_time` was renamed to `time_options` and is now an `Option`.
@phansch

This comment has been minimized.

Copy link
Contributor Author

phansch commented Oct 13, 2019

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.

@phansch

This comment has been minimized.

Copy link
Contributor Author

phansch commented Oct 13, 2019

Oh also #187 and #188 would have to be merged for a completely green build.

@phansch

This comment has been minimized.

Copy link
Contributor Author

phansch commented Oct 13, 2019

Fixing the merge conflict, one sec 😅

@Manishearth Manishearth merged commit 71c2743 into laumann:master Oct 13, 2019
0 of 2 checks passed
0 of 2 checks passed
continuous-integration/appveyor/pr Waiting for AppVeyor build to complete
Details
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
@phansch

This comment has been minimized.

Copy link
Contributor Author

phansch commented Oct 13, 2019

oh, you did it, thanks! =)

@phansch phansch deleted the phansch:fix_build branch Oct 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.