Deprecate Js.Result

Author: mchaver

jscomp/others/belt_Result.ml

@@ -22,42 +22,43 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-
-type ('a,'b) t = ('a, 'b) Js_result.t = Ok of 'a | Error of 'b
+type ('a, 'b) t =
+  | Ok of 'a
+  | Error of 'b
 
 let getExn = function
-  | Js_result.Ok x -> x
-  | Js_result.Error _ -> [%assert "getExn"]
+  | Ok x -> x
+  | Error _ -> [%assert "getExn"]
 
 let mapWithDefaultU opt default f = match opt with
-  | Js_result.Ok x -> (f x [@bs])
-  | Js_result.Error _ -> default
+  | Ok x -> (f x [@bs])
+  | Error _ -> default
 
 let mapWithDefault opt default f = mapWithDefaultU opt default (fun[@bs] x -> f x)
 
 let mapU opt f = match opt with
-  | Js_result.Ok x -> Js_result.Ok (f x [@bs])
-  | Js_result.Error y -> Js_result.Error y
+  | Ok x -> Ok (f x [@bs])
+  | Error y -> Error y
 
 let map opt f = mapU opt (fun[@bs] x -> f x)
 
 let flatMapU opt f = match opt with
-  | Js_result.Ok x -> (f x [@bs])
-  | Js_result.Error y -> Js_result.Error y
+  | Ok x -> (f x [@bs])
+  | Error y -> Error y
 
 let flatMap opt f = flatMapU opt (fun[@bs] x -> f x)
 
 let getWithDefault opt default = match opt with
-  | Js_result.Ok x -> x
-  | Js_result.Error _ -> default
+  | Ok x -> x
+  | Error _ -> default
 
 let isOk = function
-  | Js_result.Ok _ -> true
-  | Js_result.Error _ -> false
+  | Ok _ -> true
+  | Error _ -> false
 
 let isError = function
-  | Js_result.Ok _ -> false
-  | Js_result.Error _ -> true
+  | Ok _ -> false
+  | Error _ -> true
 
 let eqU a b f = match (a, b) with
   | (Ok a, Ok b) -> f a b [@bs]

jscomp/others/belt_Result.mli

@@ -27,7 +27,9 @@
     Utilities for result data type.
 *)
 
-type ('a,'b) t = ('a, 'b) Js_result.t = Ok of 'a | Error of 'b
+type ('a, 'b) t =
+  | Ok of 'a
+  | Error of 'b
 
 val getExn : ('a, 'b) t -> 'a
 val mapWithDefaultU : ('a, 'c) t -> 'b -> ('a -> 'b [@bs]) -> 'b

jscomp/others/js_result.ml

@@ -22,6 +22,5 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-type (+'good, +'bad) t =
-  | Ok of 'good
-  | Error of 'bad
+type ('a, 'b) t = ('a, 'b) Belt_Result.t = Ok of 'a | Error of 'b
+[@@ocaml.deprecated "Please use `Belt.Result.t` instead"]

jscomp/others/js_result.mli

@@ -22,6 +22,5 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-type (+'good, +'bad) t =
-  | Ok of 'good
-  | Error of 'bad
+type ('a, 'b) t = ('a, 'b) Belt_Result.t = Ok of 'a | Error of 'b
+[@@ocaml.deprecated "Please use `Belt.Result.t` instead"]