Skip to content

[DO NOT MERGE] Use stable 1.85.1 release - #3960

Closed
zhassan-aws wants to merge 6 commits into
model-checking:mainfrom
zhassan-aws:stable-rust
Closed

[DO NOT MERGE] Use stable 1.85.1 release#3960
zhassan-aws wants to merge 6 commits into
model-checking:mainfrom
zhassan-aws:stable-rust

Conversation

@zhassan-aws

@zhassan-awszhassan-aws commented Mar 26, 2025•
edited by carolynzech
Loading

Copy link
Copy Markdown
Contributor

This PR is for testing CI with a version that uses the stable 1.85.1 release with RUSTC_BOOTSTRAP=1 instead of the nightly channel.

The base commit is bc134ce, which is the latest Kani commit that works with 1.85.1.

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

@github-actionsgithub-actionsBot added the Z-EndToEndBenchCI Tag a PR to run benchmark CI label Mar 26, 2025
@zhassan-aws
zhassan-aws marked this pull request as ready for review March 26, 2025 07:19
@zhassan-aws
zhassan-aws requested a review from a team as a code ownerMarch 26, 2025 07:19
@zhassan-aws
zhassan-aws marked this pull request as draft March 26, 2025 07:20
@zhassan-aws

zhassan-aws commented Mar 26, 2025•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

I'm likely going to open a PR to merge the second commit (a491cd0) in main.

EDIT: Done in #3962

@zhassan-awszhassan-aws mentioned this pull request Mar 27, 2025
Closed
tautschnig
tautschnig reviewed Mar 27, 2025
View reviewed changes

@tautschnigtautschnig left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you! Can we try to get even more of those commits into main as indicated in my comments?

Comment thread.cargo/config.toml
Comment threadkani-compiler/src/main.rs Outdated
Comment threadcprover_bindings/src/goto_program/expr.rs
Comment threadtests/cargo-ui/verbose-cmds/expected
@zhassan-aws

zhassan-aws commented Mar 27, 2025

Copy link
Copy Markdown
ContributorAuthor

Thanks for taking a look @tautschnig! I'll check which of the changes can be committed in main. Note that the changes will still need to be made in the branch as well even if we merge them in main since the branch is created from a 2-months-old commit (bc134ce). Once the branch catches up with those changes in main, the diffs will become fewer.

@tautschnig

tautschnig commented Mar 27, 2025

Copy link
Copy Markdown
Member

Thanks for taking a look @tautschnig! I'll check which of the changes can be committed in main. Note that the changes will still need to be made in the branch as well even if we merge them in main since the branch is created from a 2-months-old commit (bc134ce). Once the branch catches up with those changes in main, the diffs will become fewer.

Yes, I made my comments with the idea that it'd be great to keep the diff to a minimum.

@zhassan-awszhassan-aws mentioned this pull request Mar 27, 2025
Merged
@zhassan-aws

zhassan-aws commented Mar 27, 2025

Copy link
Copy Markdown
ContributorAuthor

Opened #3964 to make the suggested changes in main.

carolynzech
carolynzech approved these changes Mar 28, 2025
View reviewed changes

@carolynzechcarolynzech left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

github-merge-queueBot pushed a commit that referenced this pull request Mar 28, 2025
@zhassan-aws@tautschnigCarolyn Zech
Enable Kani to work with a stable toolchain (#3964)
d12f10f
As discussed in #3960, applying changes needed for the stable branch in
main to minimize the differences between the two branches.
By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 and MIT licenses.
---------
Co-authored-by: Michael Tautschnig <mt@debian.org>
Co-authored-by: Carolyn Zech <cmzech@amazon.com>
@zhassan-aws

zhassan-aws commented Apr 4, 2025

Copy link
Copy Markdown
ContributorAuthor

This was pushed into the stable branch. Closing.

@zhassan-aws
zhassan-aws deleted the stable-rust branch April 4, 2025 17:55
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tautschnigtautschnigtautschnig left review comments
+1 more reviewer
@carolynzechcarolynzechcarolynzech approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

Z-EndToEndBenchCITag a PR to run benchmark CI

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@zhassan-aws@tautschnig@carolynzech