Skip to content

Commit 9bf0c69

Browse files
cknittcristianoc
authored andcommitted
Sync deprecation warnings fixes / removal of Pervasives module from syntax repo
1 parent 42833ed commit 9bf0c69

File tree

22 files changed

+44
-1813
lines changed

22 files changed

+44
-1813
lines changed

analysis/vendor/compiler-libs-406/char.mli

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ type t = char
5757

5858
val compare: t -> t -> int
5959
(** The comparison function for characters, with the same specification as
60-
{!Pervasives.compare}. Along with the type [t], this function [compare]
60+
{!Stdlib.compare}. Along with the type [t], this function [compare]
6161
allows the module [Char] to be passed as argument to the functors
6262
{!Set.Make} and {!Map.Make}. *)
6363

analysis/vendor/compiler-libs-406/digest.mli

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ type t = string
2929

3030
val compare : t -> t -> int
3131
(** The comparison function for 16-character digest, with the same
32-
specification as {!Pervasives.compare} and the implementation
32+
specification as {!Stdlib.compare} and the implementation
3333
shared with {!String.compare}. Along with the type [t], this
3434
function [compare] allows the module [Digest] to be passed as
3535
argument to the functors {!Set.Make} and {!Map.Make}.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(library
22
(name compilerlibs406)
33
(libraries)
4-
(flags -w "+26+27+32+33+39" -w "-d")
4+
(flags -w "+26+27+32+33+39")
55
(modules_without_implementation annot asttypes outcometree parsetree))

analysis/vendor/compiler-libs-406/ident.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ let same i1 i2 = i1 = i2
5555
then i1.stamp = i2.stamp
5656
else i2.stamp = 0 && i1.name = i2.name *)
5757

58-
let compare i1 i2 = Pervasives.compare i1 i2
58+
let compare i1 i2 = Stdlib.compare i1 i2
5959

6060
let binding_time i = i.stamp
6161

analysis/vendor/compiler-libs-406/int32.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,5 +64,5 @@ let of_string_opt s =
6464

6565
type t = int32
6666

67-
let compare (x: t) (y: t) = Pervasives.compare x y
67+
let compare (x: t) (y: t) = Stdlib.compare x y
6868
let equal (x: t) (y: t) = compare x y = 0

analysis/vendor/compiler-libs-406/int32.mli

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ type t = int32
172172

173173
val compare: t -> t -> int
174174
(** The comparison function for 32-bit integers, with the same specification as
175-
{!Pervasives.compare}. Along with the type [t], this function [compare]
175+
{!Stdlib.compare}. Along with the type [t], this function [compare]
176176
allows the module [Int32] to be passed as argument to the functors
177177
{!Set.Make} and {!Map.Make}. *)
178178

analysis/vendor/compiler-libs-406/int64.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,5 +71,5 @@ external float_of_bits : int64 -> float
7171

7272
type t = int64
7373

74-
let compare (x: t) (y: t) = Pervasives.compare x y
74+
let compare (x: t) (y: t) = Stdlib.compare x y
7575
let equal (x: t) (y: t) = compare x y = 0

analysis/vendor/compiler-libs-406/int64.mli

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ type t = int64
193193

194194
val compare: t -> t -> int
195195
(** The comparison function for 64-bit integers, with the same specification as
196-
{!Pervasives.compare}. Along with the type [t], this function [compare]
196+
{!Stdlib.compare}. Along with the type [t], this function [compare]
197197
allows the module [Int64] to be passed as argument to the functors
198198
{!Set.Make} and {!Map.Make}. *)
199199

analysis/vendor/compiler-libs-406/lambda.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ let default_stub_attribute =
299299

300300
(* Build sharing keys *)
301301
(*
302-
Those keys are later compared with Pervasives.compare.
302+
Those keys are later compared with Stdlib.compare.
303303
For that reason, they should not include cycles.
304304
*)
305305

analysis/vendor/compiler-libs-406/map.mli

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
struct
2929
type t = int * int
3030
let compare (x0,y0) (x1,y1) =
31-
match Pervasives.compare x0 x1 with
32-
0 -> Pervasives.compare y0 y1
31+
match Stdlib.compare x0 x1 with
32+
0 -> Stdlib.compare y0 y1
3333
| c -> c
3434
end
3535
@@ -55,7 +55,7 @@ module type OrderedType =
5555
[f e1 e2] is strictly negative if [e1] is smaller than [e2],
5656
and [f e1 e2] is strictly positive if [e1] is greater than [e2].
5757
Example: a suitable ordering function is the generic structural
58-
comparison function {!Pervasives.compare}. *)
58+
comparison function {!Stdlib.compare}. *)
5959
end
6060
(** Input signature of the functor {!Map.Make}. *)
6161

analysis/vendor/compiler-libs-406/misc.ml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -581,9 +581,9 @@ module Color = struct
581581
(* map a tag to a style, if the tag is known.
582582
@raise Not_found otherwise *)
583583
let style_of_tag s = match s with
584-
| "error" -> (!cur_styles).error
585-
| "warning" -> (!cur_styles).warning
586-
| "loc" -> (!cur_styles).loc
584+
| Format.String_tag "error" -> (!cur_styles).error
585+
| Format.String_tag "warning" -> (!cur_styles).warning
586+
| Format.String_tag "loc" -> (!cur_styles).loc
587587
| _ -> raise Not_found
588588

589589
let color_enabled = ref true
@@ -604,13 +604,13 @@ module Color = struct
604604
(* add color handling to formatter [ppf] *)
605605
let set_color_tag_handling ppf =
606606
let open Format in
607-
let functions = pp_get_formatter_tag_functions ppf () in
607+
let functions = pp_get_formatter_stag_functions ppf () in
608608
let functions' = {functions with
609-
mark_open_tag=(mark_open_tag ~or_else:functions.mark_open_tag);
610-
mark_close_tag=(mark_close_tag ~or_else:functions.mark_close_tag);
609+
mark_open_stag=(mark_open_tag ~or_else:functions.mark_open_stag);
610+
mark_close_stag=(mark_close_tag ~or_else:functions.mark_close_stag);
611611
} in
612612
pp_set_mark_tags ppf true; (* enable tags *)
613-
pp_set_formatter_tag_functions ppf functions';
613+
pp_set_formatter_stag_functions ppf functions';
614614
(* also setup margins *)
615615
pp_set_margin ppf (pp_get_margin std_formatter());
616616
()

analysis/vendor/compiler-libs-406/nativeint.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,5 +61,5 @@ let of_string_opt s =
6161

6262
type t = nativeint
6363

64-
let compare (x: t) (y: t) = Pervasives.compare x y
64+
let compare (x: t) (y: t) = Stdlib.compare x y
6565
let equal (x: t) (y: t) = compare x y = 0

analysis/vendor/compiler-libs-406/nativeint.mli

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ type t = nativeint
183183

184184
val compare: t -> t -> int
185185
(** The comparison function for native integers, with the same specification as
186-
{!Pervasives.compare}. Along with the type [t], this function [compare]
186+
{!Stdlib.compare}. Along with the type [t], this function [compare]
187187
allows the module [Nativeint] to be passed as argument to the functors
188188
{!Set.Make} and {!Map.Make}. *)
189189

analysis/vendor/compiler-libs-406/numbers.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ module Float = struct
7777
include Identifiable.Make (struct
7878
type t = float
7979

80-
let compare x y = Pervasives.compare x y
80+
let compare x y = Stdlib.compare x y
8181
let output oc x = Printf.fprintf oc "%f" x
8282
let hash f = Hashtbl.hash f
8383
let equal (i : float) j = i = j

analysis/vendor/compiler-libs-406/parmatch.ml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,10 +263,10 @@ let is_absent_pat p = match p.pat_desc with
263263
let const_compare x y =
264264
match x,y with
265265
| Const_float f1, Const_float f2 ->
266-
Pervasives.compare (float_of_string f1) (float_of_string f2)
266+
compare (float_of_string f1) (float_of_string f2)
267267
| Const_string (s1, _), Const_string (s2, _) ->
268268
String.compare s1 s2
269-
| _, _ -> Pervasives.compare x y
269+
| _, _ -> compare x y
270270

271271
let records_args l1 l2 =
272272
(* Invariant: fields are already sorted by Typecore.type_label_a_list *)

0 commit comments

Comments
 (0)