Children order: compatibility

Author: panglesd

src/document/sidebar.ml

@@ -1,3 +1,4 @@
+open Odoc_utils
 open Types
 
 let sidebar_toc_entry id content =

src/model/frontmatter.ml

@@ -22,7 +22,8 @@ let parse_child c =
 
 let parse s =
   let entries =
-    s |> String.split_on_char '\n'
+    s
+    |> Astring.String.cuts ~sep:"\n"
     |> List.map (fun l ->
            l |> fun x ->
            Astring.String.cut ~sep:":" x |> function

src/model/sidebar.ml

@@ -1,3 +1,4 @@
+open Odoc_utils
 open Paths.Identifier
 
 module CPH = Hashtbl.ContainerPage
@@ -48,7 +49,7 @@ module PageToc = struct
   let leafs (_, dir_content) =
     LPH.fold
       (fun id { title = payload; _ } acc ->
-        if String.equal "index" (Paths.Identifier.name id) then acc
+        if Astring.String.equal "index" (Paths.Identifier.name id) then acc
         else (id, payload) :: acc)
       dir_content.leafs []
 
@@ -88,7 +89,7 @@ module PageToc = struct
               String.compare (Paths.Identifier.name x) (Paths.Identifier.name y))
             contents
       | Some ch ->
-          let open Odoc_utils.OptionMonad in
+          let open OptionMonad in
           List.filter_map
             (fun c ->
               let id =

src/odoc/indexing.ml

@@ -1,3 +1,4 @@
+open Odoc_utils
 open Astring
 open Odoc_json_index
 open Or_error
@@ -162,9 +163,9 @@ let compile out_format ~output ~warnings_options ~occurrences ~lib_roots
                 let children_order = fm.Frontmatter.children_order in
                 (id, title, children_order))
               (List.filter_map
-                 (function
-                   | Paths.Identifier.(
-                       ({ iv = #LeafPage.t_pv; _ } as id), pl, fm) ->
+                 Paths.Identifier.(
+                   function
+                   | ({ iv = #LeafPage.t_pv; _ } as id), pl, fm ->
                        Some (id, pl, fm)
                    | _ -> None)
                  pages)

src/odoc/resolver.ml

@@ -84,7 +84,8 @@ end = struct
       match current_root with
       | Some root ->
           List.fold_left
-            (fun acc (x, dir) -> if String.equal x root then Some dir else acc)
+            (fun acc (x, dir) ->
+              if Astring.String.equal x root then Some dir else acc)
             None pkglist
       | None -> None
     in