Skip to content

Merge 11.0_release into master #6799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 30, 2024
Merged

Conversation

cknitt
Copy link
Member

@cknitt cknitt commented May 30, 2024

Consolidates git history and CHANGELOG.

cknitt and others added 5 commits May 30, 2024 18:48
…tion (rescript-lang#6763)

Print comments inside uncurried arrow function types correctly.
rescript-lang#6766)

Handle precedence of uncurried anonymous function in pipe chains.
# Conflicts:
#	CHANGELOG.md
… object and array.

Fixes rescript-lang#6789

The issue happens when 2 cases, here `Object` and `Array`, have identical body (here `Console.log(v)`).
The switch-generation code, which was not designed with untagged unions in mind, merges the two cases into one (and makes one of the two empty).

However, for `Object` and `Array`, what's generated is not a straight switch, but a mix of `if-then-else` and `switch`. This means that the `Object` and `Array` cases are apart in the generated code, and merging them (making one empty) is wrong.

# Conflicts:
#	CHANGELOG.md
#	jscomp/test/UntaggedVariants.js
# Conflicts:
#	CHANGELOG.md
#	jscomp/common/bs_version.ml
#	jscomp/syntax/src/res_comments_table.ml
#	jscomp/syntax/src/res_parens.ml
#	jscomp/test/UntaggedVariants.js
#	package-lock.json
#	package.json
#	packages/std/package.json
@cknitt cknitt requested review from cristianoc and zth May 30, 2024 17:47
@cknitt cknitt merged commit 86633e2 into rescript-lang:master May 30, 2024
19 checks passed
@cknitt cknitt deleted the 11-to-master branch May 30, 2024 19:17
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.

4 participants