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

Fixup Filename.check_suffix; remove duplicate ',' fix for OCAMLRUNPARAM #10873

Merged
merged 2 commits into from
Jan 11, 2022

Conversation

ctk21
Copy link
Contributor

@ctk21 ctk21 commented Jan 11, 2022

This PR tidies up unfinished business from @damiendoligez's review of #10831:

For those interested in the archeology of this:

  • The Filename.check_suffix change was introduced with ddb1b5e, but then reverted in the 4.12 release with 226b3a8. Multicore ended up not backing out 226b3a8 when rebasing to trunk from 4.12. This PR fixes the mistake.
  • Two competing fixes for , in OCAMLRUNPARAM were introduced 79870cd (multicore) and c0440d8 (trunk). Git happily allowed both to co-exist. This PR takes the (trunk) implementation.

@ctk21 ctk21 mentioned this pull request Jan 11, 2022
@ctk21
Copy link
Contributor Author

ctk21 commented Jan 11, 2022

NB: the changes included here to testsuite/tests/lib-string/test_string.ml were spotted as dropped when examining the original #9533 that introduced String.ends_with.

Copy link
Member

@avsm avsm left a comment

Choose a reason for hiding this comment

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

Thanks for the clarification @bschommer -- this change looks right to me.

@xavierleroy xavierleroy merged commit 1546e1f into ocaml:trunk Jan 11, 2022
@xavierleroy
Copy link
Contributor

xref: #10861

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.

None yet

5 participants