这是indexloc提供的服务,不要输入任何密码
Skip to content

Conversation

@liam923
Copy link
Contributor

@liam923 liam923 commented Aug 1, 2025

This PR merges in changes from OxCaml version 5.2.0minus-16. The first two commits (bce9ffe and 8d3a6f5) are the result of running the import script and can be skipped. This was a relatively straightforward merge, just with a lot of conflicts (due to a large number of typing changes in OxCaml).

There is currently a failing test (causing CI to fail) that I'm looking into.

@github-actions
Copy link

github-actions bot commented Aug 1, 2025

Compiler Merge Checklist

This PR seems to merge changes from Flambda. Please be sure to follow the below steps:

  • Update the magic numbers
  • Update list of compiler flags to ignore
  • Make Merlin know about new relevant compiler flags

If this PR is not merging changes from Flambda, feel free to ignore this comment

@liam923
Copy link
Contributor Author

liam923 commented Aug 1, 2025

I've resolved the failing test case

Copy link
Contributor

@riaqn riaqn left a comment

Choose a reason for hiding this comment

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

I had a brief look of the changes in typing that are NOT from the first four commits.

@liam923 liam923 merged commit a4a79a1 into main Aug 6, 2025
2 checks passed
@liam923 liam923 deleted the merge-5.2.0minus-16 branch August 6, 2025 18:02
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