Skip to content

Commit 4b521c8

Browse files
chenglouchenglou
authored
Cleanup following #2565 (#2576)
1 parent 1c27b71 commit 4b521c8

File tree

7 files changed

+40
-40
lines changed

7 files changed

+40
-40
lines changed

‎jscomp/others/belt.ml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,14 @@
7070
{[
7171
type t = int * int
7272
module I0 =
73-
(val Belt.Id.comparableU ~cmp:(fun[\@bs] ((a0,a1) : t) ((b0,b1) : t) ->
73+
(val Belt.Id.comparableU (fun[\@bs] ((a0,a1) : t) ((b0,b1) : t) ->
7474
match compare a0 b0 with
7575
| 0 -> compare a1 b1
7676
| c -> c
7777
))
7878
let s0 = Belt.Set.make ~id:(module I0)
7979
module I1 =
80-
(val Belt.Id.comparableU ~cmp:(fun[\@bs] ((a0,a1) : t) ((b0,b1) : t) ->
80+
(val Belt.Id.comparableU (fun[\@bs] ((a0,a1) : t) ((b0,b1) : t) ->
8181
match compare a1 b1 with
8282
| 0 -> compare a0 b0
8383
| c -> c

‎jscomp/others/belt_Map.mli

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
{[
2626
type t = int * int
2727
module I0 =
28-
(val Belt.Id.comparableU ~cmp:(fun[\@bs] ((a0,a1) : t) ((b0,b1) : t) ->
28+
(val Belt.Id.comparableU (fun[\@bs] ((a0,a1) : t) ((b0,b1) : t) ->
2929
match Pervasives.compare a0 b0 with
3030
| 0 -> Pervasives.compare a1 b1
3131
| c -> c
3232
))
3333
let s0 : (_, string, _) t = make ~id:(module I0) (* value is of type string *)
3434
module I1 =
35-
(val Belt.Id.comparableU ~cmp:(fun[\@bs] ((a0,a1) : t) ((b0,b1) : t) ->
35+
(val Belt.Id.comparableU (fun[\@bs] ((a0,a1) : t) ((b0,b1) : t) ->
3636
match compare a1 b1 with
3737
| 0 -> compare a0 b0
3838
| c -> c
@@ -122,7 +122,7 @@ val make: id:('k, 'id) id -> ('k, 'a, 'id) t
122122
(** [make ~id]
123123
124124
@example {[
125-
module IntCmp = (val Belt.Id.comparable ~cmp:(fun (x:int) y -> Pervasives.compare x y));;
125+
module IntCmp = (val Belt.Id.comparable (fun (x:int) y -> Pervasives.compare x y));;
126126
let s = make ~id:(module IntCmp)
127127
]}
128128
@@ -132,7 +132,7 @@ val make: id:('k, 'id) id -> ('k, 'a, 'id) t
132132
val isEmpty: _ t -> bool
133133
(** [isEmpty s0]
134134
@example {[
135-
module IntCmp = (val Belt.Id.comparable ~cmp:(fun (x:int) y -> Pervasives.compare x y));;
135+
module IntCmp = (val Belt.Id.comparable (fun (x:int) y -> Pervasives.compare x y));;
136136
isEmpty (ofArray [|1,"1"|] ~id:(module IntCmp)) = false;;
137137
]}
138138
*)
@@ -141,7 +141,7 @@ val has: ('k, 'a, 'id) t -> 'k -> bool
141141
(** [has s k]
142142
143143
@example {[
144-
module IntCmp = (val Belt.Id.comparable ~cmp:(fun (x:int) y -> Pervasives.compare x y));;
144+
module IntCmp = (val Belt.Id.comparable (fun (x:int) y -> Pervasives.compare x y));;
145145
has (ofArray [|1,"1"|] ~id:(module IntCmp)) 1 = true;;
146146
]}
147147
*)
@@ -187,7 +187,7 @@ val forEach: ('k, 'a, 'id) t -> ('k -> 'a -> unit) -> unit
187187
188188
@example {[
189189
module IntCmp =
190-
(val Belt.Id.comparableU ~cmp:(fun[\@bs] (x:int) y -> Pervasives.compare x y));;
190+
(val Belt.Id.comparableU (fun[\@bs] (x:int) y -> Pervasives.compare x y));;
191191
192192
let s0 = ofArray ~id:(module IntCmp) [|4,"4";1,"1";2,"2,"3""|];;
193193
let acc = ref [] ;;
@@ -205,7 +205,7 @@ val reduce: ('k, 'a, 'id) t -> 'acc -> ('acc -> 'k -> 'a -> 'acc) -> 'acc
205205
206206
@example {[
207207
module IntCmp =
208-
(val Belt.Id.comparableU ~cmp:(fun[\@bs] (x:int) y -> Pervasives.compare x y));;
208+
(val Belt.Id.comparableU (fun[\@bs] (x:int) y -> Pervasives.compare x y));;
209209
210210
let s0 = ofArray ~id:(module IntCmp) [|4,"4";1,"1";2,"2,"3""|];;
211211
reduce s0 [] (fun acc k v -> (k,v) acc ) = [4,"4";3,"3";2,"2";1,"1"];;
@@ -227,7 +227,7 @@ val size: ('k, 'a, 'id) t -> int
227227
228228
@example {[
229229
module IntCmp =
230-
(val Belt.Id.comparableU ~cmp:(fun[\@bs] (x:int) y -> Pervasives.compare x y));;
230+
(val Belt.Id.comparableU (fun[\@bs] (x:int) y -> Pervasives.compare x y));;
231231
size (ofArray [2,"2"; 2,"1"; 3,"3"] ~id:(module IntCmp)) = 2 ;;
232232
]}
233233
*)
@@ -236,7 +236,7 @@ val toArray: ('k, 'a, 'id) t -> ('k * 'a) array
236236
237237
@example {[
238238
module IntCmp =
239-
(val Belt.Id.comparableU ~cmp:(fun[\@bs] (x:int) y -> Pervasives.compare x y));;
239+
(val Belt.Id.comparableU (fun[\@bs] (x:int) y -> Pervasives.compare x y));;
240240
toArray (ofArray [2,"2"; 1,"1"; 3,"3"] ~id:(module IntCmp)) = [1,"1";2,"2";3,"3"]
241241
]}
242242
@@ -251,7 +251,7 @@ val ofArray: ('k * 'a) array -> id:('k,'id) id -> ('k,'a,'id) t
251251
(** [ofArray kvs ~id]
252252
@example {[
253253
module IntCmp =
254-
(val Belt.Id.comparableU ~cmp:(fun[\@bs] (x:int) y -> Pervasives.compare x y));;
254+
(val Belt.Id.comparableU (fun[\@bs] (x:int) y -> Pervasives.compare x y));;
255255
toArray (ofArray [2,"2"; 1,"1"; 3,"3"] ~id:(module IntCmp)) = [1,"1";2,"2";3,"3"]
256256
]}
257257
*)
@@ -260,7 +260,7 @@ val keysToArray: ('k, 'a, 'id) t -> 'k array
260260
261261
@example {[
262262
module IntCmp =
263-
(val Belt.Id.comparableU ~cmp:(fun[\@bs] (x:int) y -> Pervasives.compare x y));;
263+
(val Belt.Id.comparableU (fun[\@bs] (x:int) y -> Pervasives.compare x y));;
264264
keysToArray (ofArray [2,"2"; 1,"1"; 3,"3"] ~id:(module IntCmp)) =
265265
[|1;2;3|];;
266266
]}
@@ -270,7 +270,7 @@ val valuesToArray: ('k, 'a, 'id) t -> 'a array
270270
271271
@example {[
272272
module IntCmp =
273-
(val Belt.Id.comparableU ~cmp:(fun[\@bs] (x:int) y -> Pervasives.compare x y));;
273+
(val Belt.Id.comparableU (fun[\@bs] (x:int) y -> Pervasives.compare x y));;
274274
valuesToArray (ofArray [2,"2"; 1,"1"; 3,"3"] ~id:(module IntCmp)) =
275275
[|"1";"2";"3"|];;
276276
]}
@@ -315,7 +315,7 @@ val get: ('k, 'a, 'id) t -> 'k -> 'a option
315315
316316
@example {[
317317
module IntCmp =
318-
(val Belt.Id.comparableU ~cmp:(fun[\@bs] (x:int) y -> Pervasives.compare x y));;
318+
(val Belt.Id.comparableU (fun[\@bs] (x:int) y -> Pervasives.compare x y));;
319319
get (ofArray [2,"2"; 1,"1"; 3,"3"] ~id:(module IntCmp)) 2 =
320320
Some "2";;
321321
get (ofArray [2,"2"; 1,"1"; 3,"3"] ~id:(module IntCmp)) 2 =
@@ -352,7 +352,7 @@ val remove: ('k, 'a, 'id) t -> 'k -> ('k, 'a, 'id) t
352352
353353
@example {[
354354
module IntCmp =
355-
(val Belt.Id.comparableU ~cmp:(fun[\@bs] (x:int) y -> Pervasives.compare x y));;
355+
(val Belt.Id.comparableU (fun[\@bs] (x:int) y -> Pervasives.compare x y));;
356356
357357
let s0 = (ofArray [2,"2"; 1,"1"; 3,"3"] ~id:(module IntCmp));;
358358
@@ -380,7 +380,7 @@ val set:
380380
381381
@example {[
382382
module IntCmp =
383-
(val Belt.Id.comparableU ~cmp:(fun[\@bs] (x:int) y -> Pervasives.compare x y));;
383+
(val Belt.Id.comparableU (fun[\@bs] (x:int) y -> Pervasives.compare x y));;
384384
385385
let s0 = (ofArray [2,"2"; 1,"1"; 3,"3"] ~id:(module IntCmp));;
386386

‎jscomp/others/belt_MutableMap.mli

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@
3636
{[
3737
type t = int * int
3838
module I0 =
39-
(val Belt.Id.comparableU ~cmp:(fun[\@bs] ((a0,a1) : t) ((b0,b1) : t) ->
39+
(val Belt.Id.comparableU (fun[\@bs] ((a0,a1) : t) ((b0,b1) : t) ->
4040
match Pervasives.compare a0 b0 with
4141
| 0 -> Pervasives.compare a1 b1
4242
| c -> c
4343
))
4444
let s0 : (_, string,_) t = make ~id:(module I0)
4545
module I1 =
46-
(val Belt.Id.comparableU ~cmp:(fun[\@bs] ((a0,a1) : t) ((b0,b1) : t) ->
46+
(val Belt.Id.comparableU (fun[\@bs] ((a0,a1) : t) ((b0,b1) : t) ->
4747
match compare a1 b1 with
4848
| 0 -> compare a0 b0
4949
| c -> c

‎jscomp/others/belt_MutableSet.mli

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@
3636
{[
3737
type t = int * int
3838
module I0 =
39-
(val Belt.Id.comparableU ~cmp:(fun[\@bs] ((a0,a1) : t) ((b0,b1) : t) ->
39+
(val Belt.Id.comparableU (fun[\@bs] ((a0,a1) : t) ((b0,b1) : t) ->
4040
match Pervasives.compare a0 b0 with
4141
| 0 -> Pervasives.compare a1 b1
4242
| c -> c
4343
))
4444
let s0 = make ~id:(module I0)
4545
module I1 =
46-
(val Belt.Id.comparableU ~cmp:(fun[\@bs] ((a0,a1) : t) ((b0,b1) : t) ->
46+
(val Belt.Id.comparableU (fun[\@bs] ((a0,a1) : t) ((b0,b1) : t) ->
4747
match compare a1 b1 with
4848
| 0 -> compare a0 b0
4949
| c -> c

‎jscomp/others/belt_Set.mli

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@
3535
{[
3636
type t = int * int
3737
module I0 =
38-
(val Belt.Id.comparableU ~cmp:(fun[\@bs] ((a0,a1) : t) ((b0,b1) : t) ->
38+
(val Belt.Id.comparableU (fun[\@bs] ((a0,a1) : t) ((b0,b1) : t) ->
3939
match Pervasives.compare a0 b0 with
4040
| 0 -> Pervasives.compare a1 b1
4141
| c -> c
4242
))
4343
let s0 = make ~id:(module I0)
4444
module I1 =
45-
(val Belt.Id.comparableU ~cmp:(fun[\@bs] ((a0,a1) : t) ((b0,b1) : t) ->
45+
(val Belt.Id.comparableU (fun[\@bs] ((a0,a1) : t) ((b0,b1) : t) ->
4646
match compare a1 b1 with
4747
| 0 -> compare a0 b0
4848
| c -> c
@@ -108,7 +108,7 @@ val make: id:('value, 'id) id -> ('value, 'id) t
108108
(** [make ~id]
109109
110110
@example {[
111-
module IntCmp = (val Belt.Id.comparable ~cmp:(fun (x:int) y -> Pervasives.compare x y))
111+
module IntCmp = (val Belt.Id.comparable (fun (x:int) y -> Pervasives.compare x y))
112112
let s = make ~id:(module IntCmp)
113113
]}
114114
@@ -120,7 +120,7 @@ val ofArray: 'k array -> id:('k, 'id) id -> ('k, 'id) t
120120
121121
@example{[
122122
module IntCmp = (val Belt.Id.comparableU
123-
~cmp:(fun[\@bs]
123+
(fun[\@bs]
124124
(x:int) y -> Pervasives.compare x y));;
125125
toArray (ofArray [1;3;2;4] (module IntCmp)) = [1;2;3;4]
126126
@@ -142,7 +142,7 @@ val isEmpty: _ t -> bool
142142
@example {[
143143
module IntCmp =
144144
(val Belt.Id.comparableU
145-
~cmp:(fun[\@bs]
145+
(fun[\@bs]
146146
(x:int) y -> Pervasives.compare x y));;
147147
isEmpty (ofArray [||] ~id:(module IntCmp)) = true;;
148148
isEmpty (ofArray [|1|] ~id:(module IntCmp)) = true;;
@@ -153,7 +153,7 @@ val has: ('value, 'id) t -> 'value -> bool
153153
@example {[
154154
module IntCmp =
155155
(val Belt.Id.comparableU
156-
~cmp:(fun[\@bs]
156+
(fun[\@bs]
157157
(x:int) y -> Pervasives.compare x y));;
158158
let v = ofArray [|1;4;2;5|] ~id:(module IntCmp);;
159159
has v 3 = false;;
@@ -168,7 +168,7 @@ val add:
168168
@example {[
169169
module IntCmp =
170170
(val Belt.Id.comparableU
171-
~cmp:(fun[\@bs]
171+
(fun[\@bs]
172172
(x:int) y -> Pervasives.compare x y));;
173173
let s0 = make ~id:(module IntCmp);;
174174
let s1 = add s0 1 ;;
@@ -196,7 +196,7 @@ val remove: ('value, 'id) t -> 'value -> ('value, 'id) t
196196
@example {[
197197
module IntCmp =
198198
(val Belt.Id.comparableU
199-
~cmp:(fun[\@bs]
199+
(fun[\@bs]
200200
(x:int) y -> Pervasives.compare x y));;
201201
let s0 = ofArray ~id:(module IntCmp) [|2;3;1;4;5|];;
202202
let s1 = remove s0 1 ;;
@@ -225,7 +225,7 @@ val union: ('value, 'id) t -> ('value, 'id) t -> ('value, 'id) t
225225
@example {[
226226
module IntCmp =
227227
(val Belt.Id.comparableU
228-
~cmp:(fun[\@bs]
228+
(fun[\@bs]
229229
(x:int) y -> Pervasives.compare x y));;
230230
let s0 = ofArray ~id:(module IntCmp) [|5;2;3;5;6|]];;
231231
let s1 = ofArray ~id:(module IntCmp) [|5;2;3;1;5;4;|];;
@@ -238,7 +238,7 @@ val intersect: ('value, 'id) t -> ('value, 'id) t -> ('value, 'id) t
238238
@example {[
239239
module IntCmp =
240240
(val Belt.Id.comparableU
241-
~cmp:(fun[\@bs]
241+
(fun[\@bs]
242242
(x:int) y -> Pervasives.compare x y));;
243243
let s0 = ofArray ~id:(module IntCmp) [|5;2;3;5;6|]];;
244244
let s1 = ofArray ~id:(module IntCmp) [|5;2;3;1;5;4;|];;
@@ -251,7 +251,7 @@ val diff: ('value, 'id) t -> ('value, 'id) t -> ('value, 'id) t
251251
@example {[
252252
module IntCmp =
253253
(val Belt.Id.comparableU
254-
~cmp:(fun[\@bs]
254+
(fun[\@bs]
255255
(x:int) y -> Pervasives.compare x y));;
256256
let s0 = ofArray ~id:(module IntCmp) [|5;2;3;5;6|]];;
257257
let s1 = ofArray ~id:(module IntCmp) [|5;2;3;1;5;4;|];;
@@ -266,7 +266,7 @@ val subset: ('value, 'id) t -> ('value, 'id) t -> bool
266266
@example {[
267267
module IntCmp =
268268
(val Belt.Id.comparableU
269-
~cmp:(fun[\@bs]
269+
(fun[\@bs]
270270
(x:int) y -> Pervasives.compare x y));;
271271
let s0 = ofArray ~id:(module IntCmp) [|5;2;3;5;6|]];;
272272
let s1 = ofArray ~id:(module IntCmp) [|5;2;3;1;5;4;|];;
@@ -298,7 +298,7 @@ val forEach: ('value, 'id) t -> ('value -> unit ) -> unit
298298
@example {[
299299
module IntCmp =
300300
(val Belt.Id.comparableU
301-
~cmp:(fun[\@bs]
301+
(fun[\@bs]
302302
(x:int) y -> Pervasives.compare x y));;
303303
let s0 = ofArray ~id:(module IntCmp) [|5;2;3;5;6|]];;
304304
let acc = ref [] ;;
@@ -314,7 +314,7 @@ val reduce: ('value, 'id) t -> 'a -> ('a -> 'value -> 'a ) -> 'a
314314
@example {[
315315
module IntCmp =
316316
(val Belt.Id.comparableU
317-
~cmp:(fun[\@bs]
317+
(fun[\@bs]
318318
(x:int) y -> Pervasives.compare x y));;
319319
let s0 = ofArray ~id:(module IntCmp) [|5;2;3;5;6|]];;
320320
reduce s0 [] Bs.List.add = [6;5;3;2];;
@@ -350,7 +350,7 @@ val size: ('value, 'id) t -> int
350350
@example {[
351351
module IntCmp =
352352
(val Belt.Id.comparableU
353-
~cmp:(fun[\@bs]
353+
(fun[\@bs]
354354
(x:int) y -> Pervasives.compare x y));;
355355
let s0 = ofArray ~id:(module IntCmp) [|5;2;3;5;6|]];;
356356
size s0 = 4;;
@@ -362,7 +362,7 @@ val toArray: ('value, 'id) t -> 'value array
362362
@example {[
363363
module IntCmp =
364364
(val Belt.Id.comparableU
365-
~cmp:(fun[\@bs]
365+
(fun[\@bs]
366366
(x:int) y -> Pervasives.compare x y));;
367367
let s0 = ofArray ~id:(module IntCmp) [|5;2;3;5;6|]];;
368368
toArray s0 = [|2;3;5;6|];;

‎jscomp/test/bs_hashtbl_string_test.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ let bench3 (type t) (m : (string,t) Belt.Id.comparable) =
104104
done ;
105105
assert (Md0.size !table = 0)
106106

107-
module Sx = (val Belt.Id.comparable ~cmp:(fun (x : string) y -> compare x y ))
107+
module Sx = (val Belt.Id.comparable (fun (x : string) y -> compare x y ))
108108
module H = Belt.HashMap.String
109109
let bench4 () =
110110
let table =

‎jscomp/test/bs_map_set_dict_test.ml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module Icmp =
1010
)
1111
)
1212
module Icmp2 =
13-
(val Belt.Id.comparable ~cmp:(fun (x : int) y ->
13+
(val Belt.Id.comparable (fun (x : int) y ->
1414
compare x y ))
1515

1616
module M = Belt.Map
@@ -23,7 +23,7 @@ let m0 : (_,string,_) M.t = M.make (module Icmp)
2323

2424

2525
module I2 =
26-
(val Belt.Id.comparable ~cmp:(fun (x : int) y -> compare y x ))
26+
(val Belt.Id.comparable (fun (x : int) y -> compare y x ))
2727

2828

2929
let m = M.make (module Icmp2)

0 commit comments

Comments
 (0)