Merge pull request #305 from hannesm/no-stdcompat-require-4.13

samoht · web-flow · commit fa16caa0d775 · 2023-07-23T19:30:08.000+02:00
Remove stdcompat dependency (fixes #304), require OCaml 4.13
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -17,9 +17,7 @@ jobs:
           - windows-latest
         ocaml-compiler:
           # Decision on version matrix informed by https://discuss.ocaml.org/t/which-ocaml-compiler-versions-should-we-run-against-in-ci/7933/2
-          # But has gradually inched up due to signs of bitrot on earlier versions
-          # such as https://github.com/thierry-martinez/stdcompat/issues/26
-          - 4.08.0
+          - 4.13.x
           - 4.14.x
         include:
           - ocaml-compiler: 5.0.x
diff --git a/README.md b/README.md
@@ -55,7 +55,7 @@ $ make test
 Dependencies
 ------------
 
-The minimum version of OCaml required is 4.08.
+The minimum version of OCaml required is 4.13.
 
 Dependencies are tracked in the [dune-project](./dune-project) and can be
 installed by running:
diff --git a/dune-project b/dune-project
@@ -25,8 +25,7 @@ extension mechanism, and some other features. Note that the opam
 package installs both the OMD library and the command line tool `omd`.")
  (tags (org:ocamllabs org:mirage))
  (depends
-  (ocaml (>= 4.08))
-   stdcompat
+  (ocaml (>= 4.13))
    uutf
    uucp
    uunf
diff --git a/omd.opam b/omd.opam
@@ -22,8 +22,7 @@ homepage: "https://github.com/ocaml/omd"
 bug-reports: "https://github.com/ocaml/omd/issues"
 depends: [
   "dune" {>= "2.7"}
-  "ocaml" {>= "4.08"}
-  "stdcompat"
+  "ocaml" {>= "4.13"}
   "uutf"
   "uucp"
   "uunf"
diff --git a/src/dune b/src/dune
@@ -1,7 +1,7 @@
 (library
  (name omd)
  (public_name omd)
- (libraries uutf uucp uunf stdcompat))
+ (libraries uutf uucp uunf))
 
 (rule
  (with-stdout-to
diff --git a/src/parser.ml b/src/parser.ml
@@ -1,5 +1,4 @@
 open Ast.Impl
-open Stdcompat
 
 type 'attr link_def =
   { label : string
diff --git a/src/strSlice.ml b/src/strSlice.ml
@@ -1,5 +1,3 @@
-open Stdcompat
-
 type t =
   { base : string
   ; off : int
diff --git a/src/toc.ml b/src/toc.ml
@@ -1,5 +1,4 @@
 open Ast.Util
-open Stdcompat
 
 let rec remove_links inline =
   match inline with

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`open Ast.Impl`
`2`		`-open Stdcompat`
`3`	`2`
`4`	`3`	`type 'attr link_def =`
`5`	`4`	`{ label : string`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-open Stdcompat`
`2`		`-`
`3`	`1`	`type t =`
`4`	`2`	`{ base : string`
`5`	`3`	`; off : int`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`open Ast.Util`
`2`		`-open Stdcompat`
`3`	`2`
`4`	`3`	`let rec remove_links inline =`
`5`	`4`	`match inline with`