Skip to content

Commit 6cb30e2

Browse files
committed
Vendor OCaml Migrate ParseTree.
Summary: Problem: There exists reason packages in the wild that have `omp: *` as a dependency. A new breaking change was released in omp 2.0.0. We cannot compile against it. We also cannot upgrade to the intended replacement for the old functionality we were using `ppxlib` because it doesn't support older versions of omp. The only solution is to vendor. This should unbreak existing libraries that depend on older versions of Reason. We should have had a constraint of `omp: < 2.0.0`, but even in that case the package ecosystem essentially breaks because it splits into two sides - ones that can use 2.0.0 omp and ones that cannot. Vendoring omp solves that problem. It might not work during the next compiler upgrade though (estimated six months). Test Plan: Reviewers: CC:
1 parent cd06d0e commit 6cb30e2

File tree

208 files changed

+76751
-78
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

208 files changed

+76751
-78
lines changed

HISTORY.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
11

2-
## 3.7.0
2+
## 3.6.1
3+
34
**New Feature, Non Breaking:**
4-
- Reason Syntax v4 [NEW-FEATURE-NON-BREAKING]: Angle Brackets Type Parameters (PARSING) (@jordwalke)[https://github.com/facebook/reason/pull/2604]
5+
- Reason Syntax v4 [NEW-FEATURE-NON-BREAKING]: Angle Brackets Type Parameters (PARSING) (@jordwalke)[#2604][https://github.com/facebook/reason/pull/2604]
56

67
**Bug Fixes:**
78
- Fix printing of externals that happen to have newlines/quotes in them (@jordwalke)[#2593](https://github.com/facebook/reason/pull/2593)
89
- Fix parsing/printing of attributes on patterns (@jordwalke)[#2592](https://github.com/facebook/reason/pull/2592)
10+
- Fix Windows CI (@ManasJayanth) [#2611](https://github.com/facebook/reason/pull/2611)
11+
- Fix uncurry attribute on function application(@anmonteiro) [#2566](https://github.com/facebook/reason/pull/2566)
12+
- Support OCaml 4.11 (@anmonteiro) [#2582](https://github.com/facebook/reason/pull/2582)
13+
- Vendor ocaml-migrate-parsetree for greater compatibility (@jordwalke) [#2623](https://github.com/facebook/reason/pull/2623)
14+
15+
**Docs:**
16+
- README Reason logo (@iamdarshshah)[#2609][https://github.com/facebook/reason/pull/2609]
917

1018
## 3.6.0
1119

esy.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"@opam/utop": " >= 1.17.0 < 2.5.0",
1212
"@opam/merlin-extend": " >= 0.6",
1313
"@opam/result": "*",
14-
"@opam/ocaml-migrate-parsetree": " < 2.0.0",
15-
"@opam/dune": "< 2.0.0"
14+
"@opam/dune": "< 2.0.0",
15+
"@opam/ppx_derivers": "< 2.0.0"
1616
},
1717
"devDependencies": {
1818
"@opam/merlin": "*",
@@ -69,7 +69,6 @@
6969
"@opam/menhir",
7070
"@opam/mmap",
7171
"@opam/ocplib-endian",
72-
"@opam/ocaml-migrate-parsetree",
7372
"@opam/ocamlfind",
7473
"@opam/ppx_derivers",
7574
"@opam/react",

esy.lock/index.json

Lines changed: 2 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

reason.esy.lock/.gitattributes

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

reason.esy.lock/.gitignore

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)