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

Update rustc #721

Merged
merged 7 commits into from
Jun 24, 2024
Merged

Update rustc #721

merged 7 commits into from
Jun 24, 2024

Conversation

Nadrieril
Copy link
Collaborator

This pushes the rustc pin two months forward.

Something weird to note: in the first commit, a bunch of std functions gain a new invisible const generics argument. A later commit reverts this. But this happens again for nightlies in December. I stopped mid-November to give me time to investigate what's happening there.

@Nadrieril
Copy link
Collaborator Author

I investigated, the weirdness has to do with the const_trait attribute. E.g. rust-lang/rust#118661 adds this attribute to PartialEq, and the consequence in hax/charon is that the trait seems to have an extra const host: bool generic argument. This attribute is still here today so we'll have to handle it somehow.

@Nadrieril

This comment was marked as off-topic.

@Nadrieril
Copy link
Collaborator Author

Nadrieril commented Jun 14, 2024

The corresponding charon PR is ready (AeneasVerif/charon#254). This is ready to be merged.

@franziskuskiefer franziskuskiefer added the waiting-on-reviewer Status: Awaiting review from the assignee but also interested parties. label Jun 21, 2024
@franziskuskiefer franziskuskiefer requested a review from W95Psp June 21, 2024 07:37
Copy link
Collaborator

@W95Psp W95Psp left a comment

Choose a reason for hiding this comment

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

Thank you and sorry for the long response time. That looks good to me, let's merge that ASAP!

@W95Psp W95Psp enabled auto-merge June 24, 2024 06:55
@W95Psp W95Psp added this pull request to the merge queue Jun 24, 2024
@Nadrieril
Copy link
Collaborator Author

🎉 thank you!

Merged via the queue into cryspen:main with commit f4fd720 Jun 24, 2024
12 of 13 checks passed
@Nadrieril Nadrieril deleted the update-rustc2 branch June 24, 2024 08:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
waiting-on-reviewer Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants