Skip to content

Commit 7a38a3c

Browse files
authored
Merge pull request #4597 from illusionalsagacity/fix-js-array-from
fix: js_array and js_array2 wrong return type for from method
2 parents 2b31d2e + 7280280 commit 7a38a3c

File tree

6 files changed

+38
-38
lines changed

6 files changed

+38
-38
lines changed

jscomp/main/builtin_cmi_datasets.ml

Lines changed: 9 additions & 9 deletions
Large diffs are not rendered by default.

jscomp/others/js_array.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ type 'a array_like = 'a Js_array2.array_like
3131
type 'a array_iter = 'a array_like
3232
*)
3333

34-
external from : 'a array_like -> 'b array = "Array.from" [@@bs.val] (* ES2015 *)
34+
external from : 'a array_like -> 'a array = "Array.from" [@@bs.val] (* ES2015 *)
3535
external fromMap : 'a array_like -> ('a -> 'b [@bs.uncurry]) -> 'b array = "Array.from" [@@bs.val] (* ES2015 *)
3636
external isArray : 'a -> bool = "Array.isArray" [@@bs.val] (* ES2015 *)
3737
(* Array.of: seems pointless unless you can bind *) (* ES2015 *)

jscomp/others/js_array2.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ type 'a array_like
3131
type 'a array_iter = 'a array_like
3232
*)
3333

34-
external from : 'a array_like -> 'b array = "Array.from" [@@bs.val] (* ES2015 *)
34+
external from : 'a array_like -> 'a array = "Array.from" [@@bs.val] (* ES2015 *)
3535
external fromMap : 'a array_like -> ('a -> 'b [@bs.uncurry]) -> 'b array = "Array.from" [@@bs.val] (* ES2015 *)
3636
external isArray : 'a -> bool = "Array.isArray" [@@bs.val] (* ES2015 *)
3737
(* Array.of: seems pointless unless you can bind *) (* ES2015 *)

lib/4.06.1/unstable/js_compiler.ml

Lines changed: 9 additions & 9 deletions
Large diffs are not rendered by default.

lib/4.06.1/unstable/js_refmt_compiler.ml

Lines changed: 9 additions & 9 deletions
Large diffs are not rendered by default.

lib/4.06.1/whole_compiler.ml

Lines changed: 9 additions & 9 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)