Upstream rebase #8
Closed
Conversation
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
…etadata) are not parsed as OCaml (ocaml-ppx#2037)
…-ppx#2175) Co-authored-by: Emile Trotignon <emile@tarides.com>
Note for future rebasing: - `dune b @test/passing/runtest` expected to fail due to missing `[@ocaml.curry]`s - `make test` expected to fail loudly.
Note for future rebasing:
- `dune b @test/passing/runtest` expected to fail due to missing
error on `local.ml`. When I run explicitly on that file, like:
$ ./_build/default/bin/ocamlformat/main.exe test/passing/tests/local.ml
I get a "BUG: generating invalid ocaml syntax." error.
- `make test` expected to fail loudly.
Note for future rebasing: - `dune b @test/passing/runtest` expected to fail due to `local_` being printed as attrs and extensions in `local.ml` - `make test` expected to fail loudly.
Note for future rebasing: - `dune b @test/passing/runtest` expected to fail due to `local_` being printed as an extension. - `make test` expected to fail loudly.
Note for future rebasing: - `dune b @test/passing/runtest` PASSES - `make test` PASSES (which I achieved by running `dune fmt` to restyle the files within ocamlformat itself, and `make promote-regtests` to deal with one of the patch file things. To be careful, I only wanted to run those once the `dune b ...` command succeeded).
Autogenerated attributes are now 'extension.foo' instead of 'ocaml.foo'
Signed-off-by: Cameron Wong <cwong@janestreet.com>
* Initial support for the include_functor extension * Add test for include functor Signed-off-by: Chris Casinghino <ccasinghino@janestreet.com>
) A bug in the previous patch for locals causes ocamlformat to incorrectly format local arguments which are punned with a label and have a type signature: fun ~(local_ x : t) -> ... by putting an extra invalid pair of parens around (x : t). This patch removes the parens. Signed-off-by: Stephen Dolan <sdolan@janestreet.com>
…] (oxcaml#6) Signed-off-by: Stephen Dolan <sdolan@janestreet.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
16 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.
Rebasing JS changes onto upstream ocamlformat