Compat with 4.02

Signed-off-by: Paul-Elliot <[email protected]>

Author: panglesd

src/loader/cmt.ml

@@ -453,7 +453,7 @@ and read_module_binding env parent mb =
     | _, _ -> false
 #else
     match canonical with
-    | None -> Odoc_model.Root.contains_double_underscore (Ident.name mb.mb_id)
+    | None -> Odoc_model.Names.contains_double_underscore (Ident.name mb.mb_id)
     | _ -> false
 #endif
   in

src/loader/cmti.ml

@@ -632,7 +632,7 @@ and read_module_declaration env parent md =
     | _,_ -> false
 #else
     match canonical with
-    | None -> Odoc_model.Root.contains_double_underscore (Ident.name md.md_id)
+    | None -> Odoc_model.Names.contains_double_underscore (Ident.name md.md_id)
     | _ -> false
 #endif
   in

src/odoc/bin/main.ml

@@ -1111,6 +1111,8 @@ module Targets = struct
 end
 
 module Occurrences = struct
+  open Or_error
+
   let has_occurrences_prefix input =
     input |> Fs.File.basename |> Fs.File.to_string
     |> Astring.String.is_prefix ~affix:"occurrences-"
@@ -1122,7 +1124,6 @@ module Occurrences = struct
     else if not (has_occurrences_prefix f) then
       Error (`Msg "Output file must be prefixed with 'occurrences-'.")
     else Ok f
-  open Or_error
   module Count = struct
     let count directories dst warnings_options include_hidden =
       dst_of_string dst >>= fun dst ->

src/odoc/occurrences.ml

@@ -87,9 +87,10 @@ end = struct
     ()
 
   let rec get t id =
-    let ( >>= ) = Option.bind in
     let do_ parent =
-      get t (parent :> key) >>= fun { sub; _ } -> H.find_opt sub id
+      get t (parent :> key) |> function
+      | None -> None
+      | Some { sub; _ } -> ( try Some (H.find sub id) with Not_found -> None)
     in
     match id.iv with
     | `InstanceVariable (parent, _) -> do_ parent
@@ -106,7 +107,7 @@ end = struct
     | `Class (parent, _) -> do_ parent
     | `Value (parent, _) -> do_ parent
     | `ClassType (parent, _) -> do_ parent
-    | `Root _ -> H.find_opt t id
+    | `Root _ -> ( try Some (H.find t id) with Not_found -> None)
     | `SourcePage _ | `Page _ | `LeafPage _ | `CoreType _ | `SourceLocation _
     | `CoreException _ | `Label _ | `SourceLocationMod _ | `Result _
     | `AssetFile _ | `SourceDir _ | `SourceLocationInternal _ ->