Update merlin to 501 #21
Merged
Conversation
This file contains 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
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.
Baseby revertingocaml/ocaml#11515ocaml-flambda/flambda-backend#2029; if any changes to that are suggested in review, I'll make them here as well.[1] Several can be ignored as they don't affect type-checking. (That might be surprising for
no-auto-include-otherlibs, but this flag is just not used by merlin as far as I can tell. I've asked Greta to see if that's surprising.)-cmi-fileis new and seemingly can't be ignored, but was missing the arg-parsing code, so I've added it. I'll make an issue upstream.