From a9d03244f2fe04080b8b7af61ff427b2d7162428 Mon Sep 17 00:00:00 2001 From: Andrew Herron Date: Thu, 7 Dec 2023 21:57:48 +1100 Subject: [PATCH 1/2] Restored belt Ok and Error constructors --- CHANGELOG.md | 4 ++++ jscomp/others/belt_Result.res | 4 +++- jscomp/others/belt_Result.resi | 4 +++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 101f76518a..b85288a542 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,10 @@ # 11.0.0-rc.8 (Unreleased) +#### :bug: Bug Fix + +- Fix accidental removal of `Belt.Result.Ok` and `Belt.Result.Error` constructors in rc.5 + # 11.0.0-rc.7 #### :rocket: New Feature diff --git a/jscomp/others/belt_Result.res b/jscomp/others/belt_Result.res index 607ad01fd6..a1cbba1459 100644 --- a/jscomp/others/belt_Result.res +++ b/jscomp/others/belt_Result.res @@ -22,7 +22,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -type t<'a, 'b> = result<'a, 'b> +type t<'a, 'b> = result<'a, 'b> = + | Ok('a) + | Error('b) let getExn = x => switch x { diff --git a/jscomp/others/belt_Result.resi b/jscomp/others/belt_Result.resi index c88d5c736f..4e47d11c66 100644 --- a/jscomp/others/belt_Result.resi +++ b/jscomp/others/belt_Result.resi @@ -29,7 +29,9 @@ This module gives you useful utilities to create and combine `Result` data. */ -type t<'a, 'b> = result<'a, 'b> +type t<'a, 'b> = result<'a, 'b> = + | Ok('a) + | Error('b) /** `getExn(res)`: when `res` is `Ok(n)`, returns `n` when `res` is `Error(m)`, raise an exception From d9a79e895168f3ac6a1872cf2a8827dd1a96bf80 Mon Sep 17 00:00:00 2001 From: Andrew Herron Date: Thu, 7 Dec 2023 22:02:05 +1100 Subject: [PATCH 2/2] Add PR URL to changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b85288a542..5a6468049e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ #### :bug: Bug Fix -- Fix accidental removal of `Belt.Result.Ok` and `Belt.Result.Error` constructors in rc.5 +- Fix accidental removal of `Belt.Result.Ok` and `Belt.Result.Error` constructors in rc.5 https://github.com/rescript-lang/rescript-compiler/pull/6514 # 11.0.0-rc.7