Fixup Filename.check_suffix; remove duplicate ',' fix for OCAMLRUNPARAM#10873
Merged
xavierleroy merged 2 commits intoocaml:trunkfrom Jan 11, 2022
Merged
Fixup Filename.check_suffix; remove duplicate ',' fix for OCAMLRUNPARAM#10873xavierleroy merged 2 commits intoocaml:trunkfrom
xavierleroy merged 2 commits intoocaml:trunkfrom
Conversation
…ds_with testcode in lib-string/test_string.ml
Merged
Contributor
Author
|
NB: the changes included here to |
kayceesrk
approved these changes
Jan 11, 2022
avsm
reviewed
Jan 11, 2022
avsm
approved these changes
Jan 11, 2022
Member
avsm
left a comment
There was a problem hiding this comment.
Thanks for the clarification @bschommer -- this change looks right to me.
Contributor
|
xref: #10861 |
34 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR tidies up unfinished business from @damiendoligez's review of #10831:
Filename.check_suffixunintended revert: Multicore OCaml #10831 (comment)caml_parse_ocamlrunparamduplicate fix for empty,in OCAMLRUNPARAM: Multicore OCaml #10831 (comment)For those interested in the archeology of this:
Filename.check_suffixchange 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.,in OCAMLRUNPARAM were introduced 79870cd (multicore) and c0440d8 (trunk). Git happily allowed both to co-exist. This PR takes the (trunk) implementation.