Move List compat layer to Odoc_list

Author: gpetiot

src/utils/odoc_list.ml

@@ -0,0 +1,29 @@
+include List
+
+let rec concat_map ?sep ~f = function
+  | [] -> []
+  | [ x ] -> f x
+  | x :: xs -> (
+      let hd = f x in
+      let tl = concat_map ?sep ~f xs in
+      match sep with None -> hd @ tl | Some sep -> hd @ (sep :: tl))
+
+let rec filter_map acc f = function
+  | hd :: tl ->
+      let acc = match f hd with Some x -> x :: acc | None -> acc in
+      filter_map acc f tl
+  | [] -> List.rev acc
+
+let filter_map f x = filter_map [] f x
+
+(** @raise [Failure] if the list is empty. *)
+let rec last = function
+  | [] -> failwith "Odoc_utils.List.last"
+  | [ x ] -> x
+  | _ :: tl -> last tl
+
+(* From ocaml/ocaml *)
+let rec find_map f = function
+  | [] -> None
+  | x :: l -> (
+      match f x with Some _ as result -> result | None -> find_map f l)

src/utils/odoc_utils.ml

@@ -45,37 +45,7 @@ module EitherMonad = struct
   let of_result = function Result.Ok x -> Right x | Error y -> Left y
 end
 
-module List = struct
-  include List
-
-  let rec concat_map ?sep ~f = function
-    | [] -> []
-    | [ x ] -> f x
-    | x :: xs -> (
-        let hd = f x in
-        let tl = concat_map ?sep ~f xs in
-        match sep with None -> hd @ tl | Some sep -> hd @ (sep :: tl))
-
-  let rec filter_map acc f = function
-    | hd :: tl ->
-        let acc = match f hd with Some x -> x :: acc | None -> acc in
-        filter_map acc f tl
-    | [] -> List.rev acc
-
-  let filter_map f x = filter_map [] f x
-
-  (** @raise [Failure] if the list is empty. *)
-  let rec last = function
-    | [] -> failwith "Odoc_utils.List.last"
-    | [ x ] -> x
-    | _ :: tl -> last tl
-
-  (* From ocaml/ocaml *)
-  let rec find_map f = function
-    | [] -> None
-    | x :: l -> (
-        match f x with Some _ as result -> result | None -> find_map f l)
-end
+module List = Odoc_list
 
 module Option = struct
   let map f = function None -> None | Some x -> Some (f x)

src/utils/tree.ml

@@ -1,3 +1,5 @@
+module List = Odoc_list
+
 type 'a tree = { node : 'a; children : 'a forest }
 and 'a forest = 'a tree list