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

Charon traits merge #553

Merged
merged 86 commits into from
Apr 23, 2024
Merged

Charon traits merge #553

merged 86 commits into from
Apr 23, 2024

Conversation

W95Psp
Copy link
Collaborator

@W95Psp W95Psp commented Mar 5, 2024

Todo list:

@W95Psp W95Psp force-pushed the charon_traits_merge branch 3 times, most recently from cfd1e70 to c25761c Compare March 5, 2024 17:22
@W95Psp W95Psp force-pushed the charon_traits_merge branch from c25761c to 99ca4ac Compare March 5, 2024 18:14
@W95Psp W95Psp force-pushed the charon_traits_merge branch 2 times, most recently from e11cbe9 to a515aef Compare April 9, 2024 16:13
@W95Psp W95Psp force-pushed the charon_traits_merge branch from b0802bb to 44b259d Compare April 9, 2024 16:20
@W95Psp W95Psp force-pushed the charon_traits_merge branch from b92c568 to 5ce94c4 Compare April 18, 2024 19:38
Some of the structure of the type that are used in the THIR/MIR AST
changed, thus some hashes changed as well.
@W95Psp W95Psp marked this pull request as ready for review April 18, 2024 19:47
@W95Psp
Copy link
Collaborator Author

W95Psp commented Apr 18, 2024

On my side, I'm OK with the changes introduced in this PR.
It seems huge but it's not big, the mir.rs put aside.

@franziskuskiefer, I'm postponing tests on MIR to #481: I have no time for that, and this PR has been waiting for too long, Son needs it.

However, I think we need to have #481 as soon as possible: let's plan that next Thursday at CC.

EDIT: seems like there is a regression. When extracting curve25519 from the specs repo, the frontend seemlingly produces unsafe blocks...
EDIT2: That's fixed, was a silly bug with spans

W95Psp added 2 commits April 18, 2024 21:59
The ImplExpr resolution was calling into `mir` helpers, which is failing on some test. We don't use this information in hax for THIR, so I'm just dropping that info for now.
Hax relies on span equality for uninlining macro calls, this was
broken since there is no way to recover `rust_span_data` when parsing
it back from the engine.
@W95Psp W95Psp force-pushed the charon_traits_merge branch from 02a88b9 to 0274953 Compare April 18, 2024 20:50
@franziskuskiefer franziskuskiefer added this pull request to the merge queue Apr 23, 2024
Merged via the queue into main with commit c38739d Apr 23, 2024
11 checks passed
@franziskuskiefer franziskuskiefer deleted the charon_traits_merge branch April 23, 2024 11:40
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.

3 participants