Skip to content

Update the rust toolchain to nightly-2024-04-03#3128

Closed
tautschnig wants to merge 2 commits intomodel-checking:mainfrom
tautschnig:toolchain-upgrade-2024-04-03-manual
Closed

Update the rust toolchain to nightly-2024-04-03#3128
tautschnig wants to merge 2 commits intomodel-checking:mainfrom
tautschnig:toolchain-upgrade-2024-04-03-manual

Conversation

@tautschnig
Copy link
Copy Markdown
Member

@tautschnig tautschnig commented Apr 5, 2024 •
edited
Loading

Changes required due to:

Resolves: #3130

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses.

@tautschnig
Update the rust toolchain to nightly-2024-04-03
e2856c7 
Changes required due to:
- rust-lang/rust@3da115a93b Add Ord::cmp for primitives as a BinOp in MIR

Resolves: #31XX
@github-actions github-actions bot added the Z-EndToEndBenchCI Tag a PR to run benchmark CI label Apr 5, 2024
@tautschnig
Copy link
Copy Markdown
Member Author

tautschnig commented Apr 5, 2024

The changes in this PR make Kani build with the 2024-04-03 toolchain, but compiletest then fails as we run into https://github.com/rust-lang/rust/blob/d009f60b55fe4527e7ddf122bc4520f351d7b9d4/compiler/stable_mir/src/mir/body.rs#L373 (i.e., an unimplemented! in stable_mir that was added as part of the PR that required those changes on our side in the first place). @celinval might be best placed to help resolve this?

@celinval
Copy link
Copy Markdown
Contributor

celinval commented Apr 5, 2024

Damn... this isn't good. This PR shouldn've been approved. This Fix definitely needs to be addressed on the rustc side.

@celinval
Copy link
Copy Markdown
Contributor

celinval commented Apr 9, 2024

BTW, the fix to StableMIR has been approved: rust-lang/rust#123655

@tautschnig
Copy link
Copy Markdown
Member Author

tautschnig commented Apr 9, 2024

BTW, the fix to StableMIR has been approved: rust-lang/rust#123655

Thank you @celinval for implementing this fix upstream! As this is now also merged we should be able to bump the toolchain tomorrow morning.

@celinval celinval mentioned this pull request Apr 16, 2024
Merged
@tautschnig
Copy link
Copy Markdown
Member Author

tautschnig commented Apr 16, 2024

Closing in favour of #3144.

@tautschnig tautschnig closed this Apr 16, 2024
@tautschnig tautschnig deleted the toolchain-upgrade-2024-04-03-manual branch April 16, 2024 07:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot Awaiting requested review from Copilot Copilot will automatically review once the pull request is marked ready for review

Assignees

No one assigned

Labels

Z-EndToEndBenchCI Tag a PR to run benchmark CI

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Toolchain upgrade to nightly-2024-04-03 failed

2 participants

@tautschnig @celinval