Skip to content

Commit a4909d0

Browse files
author
Cristiano Calcagno
committed
keep mergeArray, but deprecate it
1 parent 45ec437 commit a4909d0

File tree

8 files changed

+21
-0
lines changed

8 files changed

+21
-0
lines changed

jscomp/others/belt_MapInt.ml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,8 @@ let mergeMany h arr =
149149
done ;
150150
!v
151151

152+
let mergeArray = mergeMany
153+
152154
let has = I.has
153155
let cmpU = I.cmpU
154156
let cmp = I.cmp

jscomp/others/belt_MapInt.mli

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,9 @@ val merge:
121121

122122
val mergeMany: 'v t -> (key * 'v) array -> 'v t
123123

124+
[@@ocaml.deprecated "Use mergeMany instead"]
125+
val mergeArray: 'v t -> (key * 'v) array -> 'v t
126+
124127
val keepU:
125128
'v t ->
126129
(key -> 'v -> bool [@bs]) ->

jscomp/others/belt_MapString.ml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,8 @@ let mergeMany h arr =
149149
done ;
150150
!v
151151

152+
let mergeArray = mergeMany
153+
152154
let has = I.has
153155
let cmpU = I.cmpU
154156
let cmp = I.cmp

jscomp/others/belt_MapString.mli

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,9 @@ val merge:
121121

122122
val mergeMany: 'v t -> (key * 'v) array -> 'v t
123123

124+
[@@ocaml.deprecated "Use mergeMany instead"]
125+
val mergeArray: 'v t -> (key * 'v) array -> 'v t
126+
124127
val keepU:
125128
'v t ->
126129
(key -> 'v -> bool [@bs]) ->

jscomp/others/map.cppo.ml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,8 @@ let mergeMany h arr =
154154
done ;
155155
!v
156156

157+
let mergeArray = mergeMany
158+
157159
let has = I.has
158160
let cmpU = I.cmpU
159161
let cmp = I.cmp

jscomp/others/map.cppo.mli

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,9 @@ val merge:
125125

126126
val mergeMany: 'v t -> (key * 'v) array -> 'v t
127127

128+
[@@ocaml.deprecated "Use mergeMany instead"]
129+
val mergeArray: 'v t -> (key * 'v) array -> 'v t
130+
128131
val keepU:
129132
'v t ->
130133
(key -> 'v -> bool [@bs]) ->

lib/js/belt_MapInt.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,8 @@ var mergeU = Belt_internalMapInt.mergeU;
236236

237237
var merge = Belt_internalMapInt.merge;
238238

239+
var mergeArray = mergeMany;
240+
239241
var keepU = Belt_internalAVLtree.keepSharedU;
240242

241243
var keep = Belt_internalAVLtree.keepShared;
@@ -297,6 +299,7 @@ exports.update = update;
297299
exports.mergeU = mergeU;
298300
exports.merge = merge;
299301
exports.mergeMany = mergeMany;
302+
exports.mergeArray = mergeArray;
300303
exports.keepU = keepU;
301304
exports.keep = keep;
302305
exports.partitionU = partitionU;

lib/js/belt_MapString.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,8 @@ var mergeU = Belt_internalMapString.mergeU;
236236

237237
var merge = Belt_internalMapString.merge;
238238

239+
var mergeArray = mergeMany;
240+
239241
var keepU = Belt_internalAVLtree.keepSharedU;
240242

241243
var keep = Belt_internalAVLtree.keepShared;
@@ -297,6 +299,7 @@ exports.update = update;
297299
exports.mergeU = mergeU;
298300
exports.merge = merge;
299301
exports.mergeMany = mergeMany;
302+
exports.mergeArray = mergeArray;
300303
exports.keepU = keepU;
301304
exports.keep = keep;
302305
exports.partitionU = partitionU;

0 commit comments

Comments
 (0)