Merge pull request #312 from ahrefs/ocaml5

fix build with OCaml 5 (drops support for 4.02)
ocsigen · Mar 21, 2023 · b94bc3e · b94bc3e
2 parents a4a91e7 + 2f2faf3
commit b94bc3e
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 27 deletions.
diff --git a/dune-project b/dune-project
@@ -60,7 +60,7 @@
  (synopsis "Common layer for the JSX and PPX syntaxes for Tyxml")
  (depends
   (ocaml
-   (>= 4.02))
+   (>= 4.03))
   (alcotest :with-test)
   (ppxlib
    (>= 0.18))
@@ -76,7 +76,7 @@
    "TyXML provides a set of convenient combinators that uses the OCaml type system to ensure the validity of the generated documents. TyXML can be used with any representation of HTML and SVG: the textual one, provided directly by this package, or DOM trees (`js_of_ocaml-tyxml`) virtual DOM (`virtual-dom`) and reactive or replicated trees (`eliom`). You can also create your own representation and use it to instantiate a new set of combinators.")
  (depends
   (ocaml
-   (>= 4.02))
+   (>= 4.03))
   (alcotest :with-test)
   (re
    (>= 1.5.0))

diff --git a/jsx/tyxml_jsx.ml b/jsx/tyxml_jsx.ml
@@ -9,16 +9,6 @@ let is_jsx e =
   in
   List.exists f e.pexp_attributes
 
-(* When dropping support for 4.02, this module can simply be deleted. *)
-module String = struct
-  include String
-  let lowercase_ascii = String.lowercase [@ocaml.warning "-3"]
-end
-module Char = struct
-  include Char
-  let lowercase_ascii = Char.lowercase [@ocaml.warning "-3"]
-end
-
 let lowercase_lead s =
   String.mapi (fun i c -> if i = 0 then Char.lowercase_ascii c else c) s
 

diff --git a/ppx/tyxml_ppx.ml b/ppx/tyxml_ppx.ml
@@ -19,12 +19,6 @@
 
 open Tyxml_syntax
 
-(* When dropping support for 4.02, this module can simply be deleted. *)
-module String = struct
-  include String
-  let capitalize_ascii = String.capitalize [@ocaml.warning "-3"]
-end
-
 open Ppxlib.Asttypes
 open Ppxlib.Parsetree
 

diff --git a/syntax/name_convention.ml b/syntax/name_convention.ml
@@ -4,13 +4,6 @@
    see <http://www.w3.org/TR/html51/syntax.html#syntax>
 *)
 
-(* When dropping support for 4.02, this module can simply be deleted. *)
-module Char = struct
-  include Char
-  let lowercase_ascii = Char.lowercase [@ocaml.warning "-3"]
-  let uppercase_ascii = Char.uppercase [@ocaml.warning "-3"]
-end
-
 (* In the ocaml parser:
    let identchar = ['A'-'Z' 'a'-'z' '_' '\'' '0'-'9']
 *)

diff --git a/tyxml-syntax.opam b/tyxml-syntax.opam
@@ -9,7 +9,7 @@ doc: "https://ocsigen.org/tyxml/latest/manual/intro"
 bug-reports: "https://github.com/ocsigen/tyxml/issues"
 depends: [
   "dune" {>= "2.7"}
-  "ocaml" {>= "4.02"}
+  "ocaml" {>= "4.03"}
   "alcotest" {with-test}
   "ppxlib" {>= "0.18"}
   "re" {>= "1.5.0"}

diff --git a/tyxml.opam b/tyxml.opam
@@ -11,7 +11,7 @@ doc: "https://ocsigen.org/tyxml/latest/manual/intro"
 bug-reports: "https://github.com/ocsigen/tyxml/issues"
 depends: [
   "dune" {>= "2.7"}
-  "ocaml" {>= "4.02"}
+  "ocaml" {>= "4.03"}
   "alcotest" {with-test}
   "re" {>= "1.5.0"}
   "seq"