From 80af131250f413b759d277ac27a05c895f260dab Mon Sep 17 00:00:00 2001 From: Cristiano Calcagno Date: Thu, 13 Jun 2024 16:34:43 +0200 Subject: [PATCH 1/3] Fix type of `Nullable.t` which was not untagged in the implementation. --- CHANGELOG.md | 1 + src/Core__Nullable.res | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d29a73e..8b5bf9d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## Next version - BREAKING: Fixes the type of `RegExp.Result.t` to be `array>` instead of `array`. https://github.com/rescript-association/rescript-core/pull/234. +- Fix type of `Nullable.t` which was not untagged in the implementation. https://github.com/rescript-association/rescript-core/pull/235 ## 1.4.0 diff --git a/src/Core__Nullable.res b/src/Core__Nullable.res index 6a918473..a1d321da 100644 --- a/src/Core__Nullable.res +++ b/src/Core__Nullable.res @@ -1,3 +1,4 @@ +@unboxed type t<'a> = Js.Nullable.t<'a> = | Value('a) | @as(null) Null From 54d14e65360a71749846d08c66c70403ff2c11c3 Mon Sep 17 00:00:00 2001 From: Cristiano Calcagno Date: Thu, 13 Jun 2024 16:51:25 +0200 Subject: [PATCH 2/3] More fixes w.r.t. compiler master. Unused `as` annotations are not picked up. --- src/intl/Core__Intl__Common.res | 2 +- src/intl/Core__Intl__DateTimeFormat.res | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/intl/Core__Intl__Common.res b/src/intl/Core__Intl__Common.res index e0cea141..ad62583d 100644 --- a/src/intl/Core__Intl__Common.res +++ b/src/intl/Core__Intl__Common.res @@ -1,4 +1,4 @@ -type localeMatcher = [#lookup | @as("best fit") #bestFit] +type localeMatcher = [#lookup | #bestFit] type calendar = [ | #buddhist diff --git a/src/intl/Core__Intl__DateTimeFormat.res b/src/intl/Core__Intl__DateTimeFormat.res index 1b9cec98..76be413e 100644 --- a/src/intl/Core__Intl__DateTimeFormat.res +++ b/src/intl/Core__Intl__DateTimeFormat.res @@ -26,7 +26,7 @@ type timeZoneName = [ ] type hourCycle = [#h11 | #h12 | #h23 | #h24] -type formatMatcher = [#basic | @as("best fit") #bestFit] +type formatMatcher = [#basic | #bestFit] type fractionalSecondDigits = [#0 | #1 | #2 | #3] type options = { From c867c56056152a04a38477a44c9c5e8dcc2a90db Mon Sep 17 00:00:00 2001 From: Cristiano Calcagno Date: Fri, 14 Jun 2024 08:53:44 +0200 Subject: [PATCH 3/3] Use #"best fit" --- src/intl/Core__Intl__Common.res | 2 +- src/intl/Core__Intl__DateTimeFormat.res | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/intl/Core__Intl__Common.res b/src/intl/Core__Intl__Common.res index ad62583d..6cc3a625 100644 --- a/src/intl/Core__Intl__Common.res +++ b/src/intl/Core__Intl__Common.res @@ -1,4 +1,4 @@ -type localeMatcher = [#lookup | #bestFit] +type localeMatcher = [#lookup | #"best fit"] type calendar = [ | #buddhist diff --git a/src/intl/Core__Intl__DateTimeFormat.res b/src/intl/Core__Intl__DateTimeFormat.res index 76be413e..04e4dac8 100644 --- a/src/intl/Core__Intl__DateTimeFormat.res +++ b/src/intl/Core__Intl__DateTimeFormat.res @@ -26,7 +26,7 @@ type timeZoneName = [ ] type hourCycle = [#h11 | #h12 | #h23 | #h24] -type formatMatcher = [#basic | #bestFit] +type formatMatcher = [#basic | #"best fit"] type fractionalSecondDigits = [#0 | #1 | #2 | #3] type options = {