Children order: compatibility

src/model/sidebar.ml

@@ -168,7 +168,8 @@ module PageToc = struct
     in
     let ordered =
       ordered
-      |> List.sort (fun (i, _) (j, _) -> Int.compare i j)
+      |> List.sort (fun (i, _) (j, _) ->
+             (Stdlib.compare : int -> int -> int) i j)
       |> List.map snd
     in
     let unordered =

src/model_desc/lang_desc.ml

@@ -1,5 +1,6 @@
 open Type_desc
 open Odoc_model
+open Odoc_utils
 open Paths_desc
 open Comment_desc
 module T = Type_desc

src/odoc/compile.ml

@@ -2,6 +2,7 @@ open Astring
 open Odoc_model
 open Odoc_model.Names
 open Or_error
+open Odoc_utils
 
 (*
  * Copyright (c) 2014 Leo White <leo@lpw25.net>

src/utils/odoc_utils.ml

@@ -75,20 +75,18 @@ module List = struct
     | [] -> None
     | x :: l -> (
         match f x with Some _ as result -> result | None -> find_map f l)
-
-  let partition_map p l =
-    let rec part left right = function
-      | [] -> (rev left, rev right)
-      | x :: l -> (
-          match p x with
-          | `Left v -> part (v :: left) right l
-          | `Right v -> part left (v :: right) l)
-    in
-    part [] [] l
 end
 
 module Option = struct
   let map f = function None -> None | Some x -> Some (f x)
+
+  let is_some = function None -> false | Some _ -> true
+end
+
+module Result = struct
+  include Result
+
+  let join = function Ok r -> r | Error _ as e -> e
 end
 
 module Fun = struct