这是indexloc提供的服务,不要输入任何密码
Skip to content

Conversation

@mdelvecchio-jsc
Copy link

The jane branch was previously about 7 months behind upstream, so this rebase catches us up. Rebases were getting unwieldy due to the divergence of upstream and poor commit history of jane, so squashing these commits into one made it easier to resolve conflicts, especially in places where fixes to earlier merge conflicts depended on changes introduced in later commits.

Notable changes in this commit:

Initial patches to parser for janestreet specific extensions (local_, global_)
Support for include functor
Support for polymorphic function parameters
Support for comprehensions
Support for immutable arrays
Support for layout annotations
Support for exclave_ syntax
Support for unboxed float literals and float#
Support for explicit strengthening
Mode for rewriting local-mode attributes into their keyword form
Changes authored by:

antalsz
ccasin
cwong-ocaml
goldfirere
Julow
riaqn
rleshchinskiy
stedolan
tdelvecchio-jsc

@mdelvecchio-jsc mdelvecchio-jsc force-pushed the tdelvecchio-jane-squash-rebase-on-upstream branch from 762d4d1 to 4a213e2 Compare November 2, 2023 21:33
@mdelvecchio-jsc mdelvecchio-jsc marked this pull request as ready for review November 3, 2023 20:34
@mdelvecchio-jsc mdelvecchio-jsc merged commit 21fd82a into jane Nov 3, 2023
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.

2 participants