Rebase on upstream (take three) #14
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
(Note for future rebases: at this stage it is expected that `dune b @test/passing/runtest` will give errors related to extra `[@ocaml.curry]`s)
Note for future rebases: it is expected that `dune b
@test/passing/runtest` will fail at this stage, in my case with
output:
File "test/passing/dune.inc", line 3594, characters 0-205:
3594 | (rule
3595 | (deps tests/.ocamlformat )
3596 | (package ocamlformat)
3597 | (action
3598 | (with-stdout-to local.ml.stdout
3599 | (with-stderr-to local.ml.stderr
3600 | (run %{bin:ocamlformat} --margin-check %{dep:tests/local.ml})))))
Command exited with code 1.
For reference during future rebasing: `dune b @test/passing/runtest` is not expected to succeed on this commit. I get formatting changes in `test/passing/tests/local.ml` where `local_` has been turned into an attribute.
For future reference during rebasing: `dune b @test/passing/runtest` is not expected to pass on this commit. Some uses of `local_` are turned into `[%extension.local]`.
For reference during future rebases: `dune b @test/passing/runtest` is expected to pass on this commit.
For future rebases: `make test` should pass at this stage. It may be necessary to run `dune fmt` and `make regtests-promote` (but I checked `dune b @test/passing/runtest` succeeded first)
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>
Signed-off-by: Chris Casinghino <ccasinghino@janestreet.com>
|
Re. #2: |
antalsz
suggested changes
Mar 6, 2023
antalsz
left a comment
There was a problem hiding this comment.
I went through and grepped the testsuite for [: and [|, and I'm satisfied that immutable array/comprehension copies of tests occur next to all existing array tests, which is the correctness condition for adding the new tests. There's one requested change where we should use the immutable array indexing operator, but other than that the two questions for me are hereby addressed!
(... |], :].)
Signed-off-by: Antal Spector-Zabusky <antal.b.sz@gmail.com>
Signed-off-by: Antal Spector-Zabusky <antal.b.sz@gmail.com>
2773fea to
355d694
Compare
This was referenced Mar 13, 2023
Closed
|
Pushed a newer rebase. |
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.
Rebase of all Jane Street stuff (including comprehensions) onto the latest upstream ocamlformat.
@antalsz please look at two things in particular:
language_extension.{ml,mli}into theocaml-commondirectory rather than having copies in each parser. It looks like they were identical and didn't depend on anything that prevents this, but let me know if there was a reason for how it was.