Skip to content

Commit 5ce1eca

Browse files
author
Cristiano Calcagno
committed
deprecation warnings
1 parent 25db82b commit 5ce1eca

29 files changed

+215
-242
lines changed

‎jscomp/test/bs_unwrap_test.ml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ external log3 :
3131
| `Int of int
3232
] [@bs.unwrap])
3333
-> ?opt:([ `String of string
34-
| `Bool of Js.boolean
34+
| `Bool of bool
3535
] [@bs.unwrap])
3636
-> unit
3737
-> unit = "console.log" [@@bs.val]
@@ -42,7 +42,7 @@ let _ = log3 ~req:(`Int 3) ?opt:(Some (`String "hi")) ()
4242
let _ = log3 ~req:(`Int 4) ?opt:None ()
4343

4444
(* static optional arg as variable *)
45-
let some_arg = Some (`Bool Js.true_)
45+
let some_arg = Some (`Bool true)
4646
let _ = log3 ~req:(`Int 5) ?opt:some_arg ()
4747

4848
let none_arg = None
@@ -65,7 +65,7 @@ let _ = log3
6565
let dyn_log3 = log3
6666

6767
(* call the dynamically reassigned external *)
68-
let _ = dyn_log3 ~req:(`Int 8) ~opt:(`Bool Js.true_) ()
68+
let _ = dyn_log3 ~req:(`Int 8) ~opt:(`Bool true) ()
6969

7070
external log4 :
7171
([ `String of string

‎jscomp/test/ffi_test.ml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ external f : int -> int = "xx" [@@bs.val ]
66
let u () = f 3
77
let v = Js.Null.empty
88

9-
let a, b ,c, d = Js.(true_, false_, Js.Null.empty, Js.Undefined.empty)
9+
let a, b ,c, d = (true, false, Js.Null.empty, Js.Undefined.empty)
1010

1111
module Textarea = struct
1212
type t

‎jscomp/test/functor_ffi.ml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module Make ( S : sig type elt end ) = struct
1010
external get : elt t -> int -> elt Js.undefined = "" [@@bs.get_index]
1111

1212
let opt_get f i =
13-
Js.Undefined.to_opt @@ get f i
13+
Js.Undefined.toOption @@ get f i
1414
end
1515

1616
module Int_arr = Make ( struct type elt = int end)

‎jscomp/test/gpr496_test.ml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ let expected2 =
2828
0
2929
)
3030
let u =
31-
(Js.true_ = Js.false_,
32-
Js.false_ = Js.true_,
33-
Js.false_ = Js.false_,
34-
Js.true_ = Js.true_,
35-
Pervasives.compare Js.false_ Js.true_ ,
36-
Pervasives.compare Js.true_ Js.false_,
37-
Pervasives.compare Js.false_ Js.false_,
38-
Pervasives.compare Js.true_ Js.true_
31+
(true = false,
32+
false = true,
33+
false = false,
34+
true = true,
35+
Pervasives.compare false true,
36+
Pervasives.compare true false,
37+
Pervasives.compare false false,
38+
Pervasives.compare true true
3939
)
4040

4141

‎jscomp/test/gpr_974_test.ml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
let _ =
44
begin
5-
assert (Js.Null_undefined.to_opt (Js.Null_undefined.return "" ) = Some "");
6-
assert (Js.Undefined.to_opt (Js.Undefined.return "" ) = Some "");
5+
assert (Js.Null_undefined.toOption (Js.Null_undefined.return "" ) = Some "");
6+
assert (Js.Undefined.toOption (Js.Undefined.return "" ) = Some "");
77
assert (Js.Null.toOption (Js.Null.return "") = Some "")
88
end

‎jscomp/test/js_bool_test.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ function f4(x) {
2727
}
2828
}
2929

30-
var f3 = true;
31-
3230
var u = ( 1);
3331

3432
var v = ( true);
@@ -120,6 +118,8 @@ var bool_array = /* array */[
120118

121119
Mt.from_pair_suites("js_bool_test.ml", suites);
122120

121+
var f3 = true;
122+
123123
exports.f = f;
124124
exports.f2 = f2;
125125
exports.f4 = f4;

‎jscomp/test/js_bool_test.ml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11

22

33
let f x =
4-
if Js.to_bool x then true else false
4+
if x then true else false
55

66
let f2 x =
7-
if Js.to_bool x then Js.true_ else Js.false_
7+
if x then true else false
88

99
let f4 x =
10-
if x then Js.true_ else Js.false_
10+
if x then true else false
1111

1212
let f3 =
13-
if Js.to_bool Js.true_ then true else false
13+
if true then true else false
1414

1515
let u : bool = [%bs.raw{| 1|}]
1616

17-
let v : Js.boolean = [%bs.raw{| true|}]
17+
let v : bool = [%bs.raw{| true|}]
1818

1919
let suites = Mt.[
20-
"caml_bool_eq_caml_bool", (fun _ -> Eq (u, f Js.true_));
20+
"caml_bool_eq_caml_bool", (fun _ -> Eq (u, f true));
2121
"js_bool_eq_js_bool",(fun _ -> Eq(v, f4 true));
2222
"js_bool_neq_acml_bool",(fun _ ->
23-
Eq( true, (f Js.true_ = [%bs.raw {|true|} ] (* not type check*))));
23+
Eq( true, (f true = [%bs.raw {|true|} ] (* not type check*))));
2424
]
2525

2626
let ff u =
27-
if u = Js.true_ then 1
27+
if u = true then 1
2828
else 2
2929

3030
let fi (x : int) y = x = y

‎jscomp/test/js_json_test.js‎

Lines changed: 53 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -429,15 +429,13 @@ var a$2 = /* array */[
429429
true
430430
];
431431

432-
var json$9 = JSON.parse(JSON.stringify($$Array.map((function (prim) {
433-
return prim;
434-
}), a$2)));
432+
var json$9 = JSON.parse(JSON.stringify(a$2));
435433

436-
eq_at_i("File \"js_json_test.ml\", line 249, characters 10-17", json$9, 0, /* Boolean */4, Caml_array.caml_array_get(a$2, 0));
434+
eq_at_i("File \"js_json_test.ml\", line 248, characters 10-17", json$9, 0, /* Boolean */4, Caml_array.caml_array_get(a$2, 0));
437435

438-
eq_at_i("File \"js_json_test.ml\", line 250, characters 10-17", json$9, 1, /* Boolean */4, Caml_array.caml_array_get(a$2, 1));
436+
eq_at_i("File \"js_json_test.ml\", line 249, characters 10-17", json$9, 1, /* Boolean */4, Caml_array.caml_array_get(a$2, 1));
439437

440-
eq_at_i("File \"js_json_test.ml\", line 251, characters 10-17", json$9, 2, /* Boolean */4, Caml_array.caml_array_get(a$2, 2));
438+
eq_at_i("File \"js_json_test.ml\", line 250, characters 10-17", json$9, 2, /* Boolean */4, Caml_array.caml_array_get(a$2, 2));
441439

442440
function make_d(s, i) {
443441
var d = { };
@@ -456,140 +454,140 @@ var json$10 = JSON.parse(JSON.stringify(a$3));
456454
var ty$6 = Js_json.classify(json$10);
457455

458456
if (typeof ty$6 === "number") {
459-
add_test("File \"js_json_test.ml\", line 283, characters 16-23", (function () {
457+
add_test("File \"js_json_test.ml\", line 282, characters 16-23", (function () {
460458
return /* Ok */Block.__(4, [false]);
461459
}));
462460
} else if (ty$6.tag === 3) {
463461
var ty$7 = Js_json.classify(Caml_array.caml_array_get(ty$6[0], 1));
464462
if (typeof ty$7 === "number") {
465-
add_test("File \"js_json_test.ml\", line 281, characters 18-25", (function () {
463+
add_test("File \"js_json_test.ml\", line 280, characters 18-25", (function () {
466464
return /* Ok */Block.__(4, [false]);
467465
}));
468466
} else if (ty$7.tag === 2) {
469467
var ty$8 = Js_json.classify(option_get(Js_primitive.undefined_to_opt(ty$7[0]["a"])));
470468
if (typeof ty$8 === "number") {
471-
add_test("File \"js_json_test.ml\", line 279, characters 20-27", (function () {
469+
add_test("File \"js_json_test.ml\", line 278, characters 20-27", (function () {
472470
return /* Ok */Block.__(4, [false]);
473471
}));
474472
} else if (ty$8.tag) {
475-
add_test("File \"js_json_test.ml\", line 279, characters 20-27", (function () {
473+
add_test("File \"js_json_test.ml\", line 278, characters 20-27", (function () {
476474
return /* Ok */Block.__(4, [false]);
477475
}));
478476
} else {
479-
eq("File \"js_json_test.ml\", line 278, characters 40-47", ty$8[0], "bbb");
477+
eq("File \"js_json_test.ml\", line 277, characters 40-47", ty$8[0], "bbb");
480478
}
481479
} else {
482-
add_test("File \"js_json_test.ml\", line 281, characters 18-25", (function () {
480+
add_test("File \"js_json_test.ml\", line 280, characters 18-25", (function () {
483481
return /* Ok */Block.__(4, [false]);
484482
}));
485483
}
486484
} else {
487-
add_test("File \"js_json_test.ml\", line 283, characters 16-23", (function () {
485+
add_test("File \"js_json_test.ml\", line 282, characters 16-23", (function () {
488486
return /* Ok */Block.__(4, [false]);
489487
}));
490488
}
491489

492490
try {
493491
JSON.parse("{{ A}");
494-
add_test("File \"js_json_test.ml\", line 289, characters 11-18", (function () {
492+
add_test("File \"js_json_test.ml\", line 288, characters 11-18", (function () {
495493
return /* Ok */Block.__(4, [false]);
496494
}));
497495
}
498496
catch (exn){
499-
add_test("File \"js_json_test.ml\", line 292, characters 10-17", (function () {
497+
add_test("File \"js_json_test.ml\", line 291, characters 10-17", (function () {
500498
return /* Ok */Block.__(4, [true]);
501499
}));
502500
}
503501

504-
eq("File \"js_json_test.ml\", line 296, characters 12-19", Js_primitive.undefined_to_opt(JSON.stringify(/* array */[
502+
eq("File \"js_json_test.ml\", line 295, characters 12-19", Js_primitive.undefined_to_opt(JSON.stringify(/* array */[
505503
1,
506504
2,
507505
3
508506
])), /* Some */["[1,2,3]"]);
509507

510-
eq("File \"js_json_test.ml\", line 300, characters 2-9", Js_primitive.undefined_to_opt(JSON.stringify({
508+
eq("File \"js_json_test.ml\", line 299, characters 2-9", Js_primitive.undefined_to_opt(JSON.stringify({
511509
foo: 1,
512510
bar: "hello",
513511
baz: {
514512
baaz: 10
515513
}
516514
})), /* Some */["{\"foo\":1,\"bar\":\"hello\",\"baz\":{\"baaz\":10}}"]);
517515

518-
eq("File \"js_json_test.ml\", line 304, characters 12-19", Js_primitive.undefined_to_opt(JSON.stringify(null)), /* Some */["null"]);
516+
eq("File \"js_json_test.ml\", line 303, characters 12-19", Js_primitive.undefined_to_opt(JSON.stringify(null)), /* Some */["null"]);
519517

520-
eq("File \"js_json_test.ml\", line 306, characters 12-19", Js_primitive.undefined_to_opt(JSON.stringify(undefined)), /* None */0);
518+
eq("File \"js_json_test.ml\", line 305, characters 12-19", Js_primitive.undefined_to_opt(JSON.stringify(undefined)), /* None */0);
521519

522-
eq("File \"js_json_test.ml\", line 309, characters 5-12", Js_json.decodeString("test"), /* Some */["test"]);
520+
eq("File \"js_json_test.ml\", line 308, characters 5-12", Js_json.decodeString("test"), /* Some */["test"]);
523521

524-
eq("File \"js_json_test.ml\", line 311, characters 5-12", Js_json.decodeString(true), /* None */0);
522+
eq("File \"js_json_test.ml\", line 310, characters 5-12", Js_json.decodeString(true), /* None */0);
525523

526-
eq("File \"js_json_test.ml\", line 313, characters 5-12", Js_json.decodeString(/* array */[]), /* None */0);
524+
eq("File \"js_json_test.ml\", line 312, characters 5-12", Js_json.decodeString(/* array */[]), /* None */0);
527525

528-
eq("File \"js_json_test.ml\", line 315, characters 5-12", Js_json.decodeString(null), /* None */0);
526+
eq("File \"js_json_test.ml\", line 314, characters 5-12", Js_json.decodeString(null), /* None */0);
529527

530-
eq("File \"js_json_test.ml\", line 317, characters 5-12", Js_json.decodeString({ }), /* None */0);
528+
eq("File \"js_json_test.ml\", line 316, characters 5-12", Js_json.decodeString({ }), /* None */0);
531529

532-
eq("File \"js_json_test.ml\", line 319, characters 5-12", Js_json.decodeString(1.23), /* None */0);
530+
eq("File \"js_json_test.ml\", line 318, characters 5-12", Js_json.decodeString(1.23), /* None */0);
533531

534-
eq("File \"js_json_test.ml\", line 323, characters 5-12", Js_json.decodeNumber("test"), /* None */0);
532+
eq("File \"js_json_test.ml\", line 322, characters 5-12", Js_json.decodeNumber("test"), /* None */0);
535533

536-
eq("File \"js_json_test.ml\", line 325, characters 5-12", Js_json.decodeNumber(true), /* None */0);
534+
eq("File \"js_json_test.ml\", line 324, characters 5-12", Js_json.decodeNumber(true), /* None */0);
537535

538-
eq("File \"js_json_test.ml\", line 327, characters 5-12", Js_json.decodeNumber(/* array */[]), /* None */0);
536+
eq("File \"js_json_test.ml\", line 326, characters 5-12", Js_json.decodeNumber(/* array */[]), /* None */0);
539537

540-
eq("File \"js_json_test.ml\", line 329, characters 5-12", Js_json.decodeNumber(null), /* None */0);
538+
eq("File \"js_json_test.ml\", line 328, characters 5-12", Js_json.decodeNumber(null), /* None */0);
541539

542-
eq("File \"js_json_test.ml\", line 331, characters 5-12", Js_json.decodeNumber({ }), /* None */0);
540+
eq("File \"js_json_test.ml\", line 330, characters 5-12", Js_json.decodeNumber({ }), /* None */0);
543541

544-
eq("File \"js_json_test.ml\", line 333, characters 5-12", Js_json.decodeNumber(1.23), /* Some */[1.23]);
542+
eq("File \"js_json_test.ml\", line 332, characters 5-12", Js_json.decodeNumber(1.23), /* Some */[1.23]);
545543

546-
eq("File \"js_json_test.ml\", line 337, characters 5-12", Js_json.decodeObject("test"), /* None */0);
544+
eq("File \"js_json_test.ml\", line 336, characters 5-12", Js_json.decodeObject("test"), /* None */0);
547545

548-
eq("File \"js_json_test.ml\", line 339, characters 5-12", Js_json.decodeObject(true), /* None */0);
546+
eq("File \"js_json_test.ml\", line 338, characters 5-12", Js_json.decodeObject(true), /* None */0);
549547

550-
eq("File \"js_json_test.ml\", line 341, characters 5-12", Js_json.decodeObject(/* array */[]), /* None */0);
548+
eq("File \"js_json_test.ml\", line 340, characters 5-12", Js_json.decodeObject(/* array */[]), /* None */0);
551549

552-
eq("File \"js_json_test.ml\", line 343, characters 5-12", Js_json.decodeObject(null), /* None */0);
550+
eq("File \"js_json_test.ml\", line 342, characters 5-12", Js_json.decodeObject(null), /* None */0);
553551

554-
eq("File \"js_json_test.ml\", line 345, characters 5-12", Js_json.decodeObject({ }), /* Some */[{ }]);
552+
eq("File \"js_json_test.ml\", line 344, characters 5-12", Js_json.decodeObject({ }), /* Some */[{ }]);
555553

556-
eq("File \"js_json_test.ml\", line 348, characters 5-12", Js_json.decodeObject(1.23), /* None */0);
554+
eq("File \"js_json_test.ml\", line 347, characters 5-12", Js_json.decodeObject(1.23), /* None */0);
557555

558-
eq("File \"js_json_test.ml\", line 352, characters 5-12", Js_json.decodeArray("test"), /* None */0);
556+
eq("File \"js_json_test.ml\", line 351, characters 5-12", Js_json.decodeArray("test"), /* None */0);
559557

560-
eq("File \"js_json_test.ml\", line 354, characters 5-12", Js_json.decodeArray(true), /* None */0);
558+
eq("File \"js_json_test.ml\", line 353, characters 5-12", Js_json.decodeArray(true), /* None */0);
561559

562-
eq("File \"js_json_test.ml\", line 356, characters 5-12", Js_json.decodeArray(/* array */[]), /* Some */[/* array */[]]);
560+
eq("File \"js_json_test.ml\", line 355, characters 5-12", Js_json.decodeArray(/* array */[]), /* Some */[/* array */[]]);
563561

564-
eq("File \"js_json_test.ml\", line 358, characters 5-12", Js_json.decodeArray(null), /* None */0);
562+
eq("File \"js_json_test.ml\", line 357, characters 5-12", Js_json.decodeArray(null), /* None */0);
565563

566-
eq("File \"js_json_test.ml\", line 360, characters 5-12", Js_json.decodeArray({ }), /* None */0);
564+
eq("File \"js_json_test.ml\", line 359, characters 5-12", Js_json.decodeArray({ }), /* None */0);
567565

568-
eq("File \"js_json_test.ml\", line 362, characters 5-12", Js_json.decodeArray(1.23), /* None */0);
566+
eq("File \"js_json_test.ml\", line 361, characters 5-12", Js_json.decodeArray(1.23), /* None */0);
569567

570-
eq("File \"js_json_test.ml\", line 366, characters 5-12", Js_json.decodeBoolean("test"), /* None */0);
568+
eq("File \"js_json_test.ml\", line 365, characters 5-12", Js_json.decodeBoolean("test"), /* None */0);
571569

572-
eq("File \"js_json_test.ml\", line 368, characters 5-12", Js_json.decodeBoolean(true), /* Some */[true]);
570+
eq("File \"js_json_test.ml\", line 367, characters 5-12", Js_json.decodeBoolean(true), /* Some */[true]);
573571

574-
eq("File \"js_json_test.ml\", line 370, characters 5-12", Js_json.decodeBoolean(/* array */[]), /* None */0);
572+
eq("File \"js_json_test.ml\", line 369, characters 5-12", Js_json.decodeBoolean(/* array */[]), /* None */0);
575573

576-
eq("File \"js_json_test.ml\", line 372, characters 5-12", Js_json.decodeBoolean(null), /* None */0);
574+
eq("File \"js_json_test.ml\", line 371, characters 5-12", Js_json.decodeBoolean(null), /* None */0);
577575

578-
eq("File \"js_json_test.ml\", line 374, characters 5-12", Js_json.decodeBoolean({ }), /* None */0);
576+
eq("File \"js_json_test.ml\", line 373, characters 5-12", Js_json.decodeBoolean({ }), /* None */0);
579577

580-
eq("File \"js_json_test.ml\", line 376, characters 5-12", Js_json.decodeBoolean(1.23), /* None */0);
578+
eq("File \"js_json_test.ml\", line 375, characters 5-12", Js_json.decodeBoolean(1.23), /* None */0);
581579

582-
eq("File \"js_json_test.ml\", line 380, characters 5-12", Js_json.decodeNull("test"), /* None */0);
580+
eq("File \"js_json_test.ml\", line 379, characters 5-12", Js_json.decodeNull("test"), /* None */0);
583581

584-
eq("File \"js_json_test.ml\", line 382, characters 5-12", Js_json.decodeNull(true), /* None */0);
582+
eq("File \"js_json_test.ml\", line 381, characters 5-12", Js_json.decodeNull(true), /* None */0);
585583

586-
eq("File \"js_json_test.ml\", line 384, characters 5-12", Js_json.decodeNull(/* array */[]), /* None */0);
584+
eq("File \"js_json_test.ml\", line 383, characters 5-12", Js_json.decodeNull(/* array */[]), /* None */0);
587585

588-
eq("File \"js_json_test.ml\", line 386, characters 5-12", Js_json.decodeNull(null), /* Some */[null]);
586+
eq("File \"js_json_test.ml\", line 385, characters 5-12", Js_json.decodeNull(null), /* Some */[null]);
589587

590-
eq("File \"js_json_test.ml\", line 388, characters 5-12", Js_json.decodeNull({ }), /* None */0);
588+
eq("File \"js_json_test.ml\", line 387, characters 5-12", Js_json.decodeNull({ }), /* None */0);
591589

592-
eq("File \"js_json_test.ml\", line 390, characters 5-12", Js_json.decodeNull(1.23), /* None */0);
590+
eq("File \"js_json_test.ml\", line 389, characters 5-12", Js_json.decodeNull(1.23), /* None */0);
593591

594592
Mt.from_pair_suites("js_json_test.ml", suites[0]);
595593

0 commit comments

Comments
 (0)