From b30a6b141fed01a62330051bfb92c19564c93215 Mon Sep 17 00:00:00 2001 From: Gaƫtan Gilbert Date: Sun, 28 May 2017 13:34:42 +0200 Subject: Fail on deprecated warning even for Ocaml > 4.02.3 Deprecations which can't be fixed in 4.02.3 are locally wrapped with [@@@ocaml.warning "-3"]. The only ones encountered are - capitalize to capitalize_ascii and variants. Changing to ascii would break coqdoc -latin1 and maybe other things though. - external "noalloc" to external [@@noalloc] --- lib/cString.ml | 4 ++++ lib/cString.mli | 3 +++ lib/hashcons.ml | 4 ++++ 3 files changed, 11 insertions(+) (limited to 'lib') diff --git a/lib/cString.ml b/lib/cString.ml index 61ed03083..7048dbb81 100644 --- a/lib/cString.ml +++ b/lib/cString.ml @@ -11,7 +11,9 @@ module type S = module type of String module type ExtS = sig include S + [@@@ocaml.warning "-3"] (* [@@noalloc] since 4.03.0 GPR#240 *) external equal : string -> string -> bool = "caml_string_equal" "noalloc" + [@@@ocaml.warning "+3"] val hash : string -> int val is_empty : string -> bool val explode : string -> string list @@ -33,7 +35,9 @@ end include String +[@@@ocaml.warning "-3"] (* [@@noalloc] since 4.03.0 GPR#240 *) external equal : string -> string -> bool = "caml_string_equal" "noalloc" +[@@@ocaml.warning "+3"] let rec hash len s i accu = if i = len then accu diff --git a/lib/cString.mli b/lib/cString.mli index 65edfbbe6..b30f26abe 100644 --- a/lib/cString.mli +++ b/lib/cString.mli @@ -14,7 +14,10 @@ sig include S (** We include the standard library *) + [@@@ocaml.warning "-3"] (* [@@noalloc] since 4.03.0 GPR#240 *) external equal : string -> string -> bool = "caml_string_equal" "noalloc" + [@@@ocaml.warning "+3"] + (** Equality on strings *) val hash : string -> int diff --git a/lib/hashcons.ml b/lib/hashcons.ml index 4eaacf914..0ee3ec627 100644 --- a/lib/hashcons.ml +++ b/lib/hashcons.ml @@ -130,7 +130,11 @@ module Hstring = Make( type t = string type u = unit let hashcons () s =(* incr accesstr;*) s + + [@@@ocaml.warning "-3"] (* [@@noalloc] since 4.03.0 GPR#240 *) external eq : string -> string -> bool = "caml_string_equal" "noalloc" + [@@@ocaml.warning "+3"] + (** Copy from CString *) let rec hash len s i accu = if i = len then accu -- cgit v1.2.3