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

Fix issues from a merge between merge-5.2-staging and main #3053

Merged

Conversation

ncik-roberts
Copy link
Contributor

Fix some tiny issues observed in this part of the merge:

-- The following is in effect a single merge (see below):
bac195af1fb487ccea799943f5666403bd78bfae dynlink dune again
8691c427ef0aee9181a2ebe655ea2ce631b22f5c Add jkind_axis to modules_without_implementation
764f730e5da69c373a7c03977e01b56893e9062f Dubious merge fixes
3970ad5e7ca99cfb1e60dd8c5e256669fe1ff726 Merge fixes
4b06f1928848af7c31aabe74f26a3f5a9b8818a5 Fixes to Select_utils required by previous merge => mshinwell confirms this changeset is ok
b180783b26b342885ee267ccfb3fa14778263c2d Merge remote-tracking branch 'flambda-backend/main' into merge-5.2
  => merge should be redone without resolving conflicts and then diffed directly against
     bac195af1fb487ccea799943f5666403bd78bfae as not all fixes were committed with the merge itself (but some were)

described here.

Mostly:

  • use Chris's implementation of unboxed tuple printing
  • use consistent type-checking for Pexp_unboxed_tuple and Pexp_tuple
  • allow local opens in unboxed tuple types
  • add an (I think) dropped profile_counters_function.mli. I'm least confident about this one.

Copy link
Contributor

@ccasin ccasin left a comment

Choose a reason for hiding this comment

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

LGTM

@mshinwell mshinwell merged commit 657ff88 into merge-5.2-staging Sep 20, 2024
16 checks passed
@mshinwell mshinwell deleted the nroberts-merge-5.2-staging-fix-issues-from-merge branch September 20, 2024 08:50
lukemaurer pushed a commit that referenced this pull request Oct 23, 2024
…and `main` (#3053)

* Fix issues from merge

* Fix clear bug in unboxed product tests
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants