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

Fix CI failures #2000

Merged
merged 2 commits into from
Dec 10, 2019
Merged

Fix CI failures #2000

merged 2 commits into from
Dec 10, 2019

Conversation

Nemo157
Copy link
Member

@Nemo157 Nemo157 commented Dec 9, 2019

Remove -Z install-upgrade for cargo-hack, this is now the default since rust-lang/cargo#7560.

Add allow(unreachable_code) for usage of try_join with the never type, fixes #1992.

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
This is now the default since
rust-lang/cargo#7560

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
@Nemo157
Copy link
Member Author

Nemo157 commented Dec 10, 2019

Although, given the latest conclusions in rust-lang/rust#66757 that test will start failing to compile on a future nightly. It can probably use core::convert::Infallible which will not actually test what it intends to test once the never type is reverted, but as soon as it is stabilised again the test will be correct and let us know if there's been a regression, and the fix works fine either way.

@cramertj cramertj merged commit 5f9ae4c into rust-lang:master Dec 10, 2019
@Nemo157 Nemo157 deleted the fix-ci branch December 16, 2019 14:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Unreachable code generated by try_join! with never error
3 participants