Occurrences: compatibility with different OCaml versions and fmt

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

Author: panglesd

src/loader/cmt.ml

@@ -382,16 +382,16 @@ let rec read_module_expr env parent label_parent mexpr =
         Functor (f_parameter, res)
 #else
     | Tmod_functor(id, _, arg, res) ->
-        let new_env = Env.add_parameter parent id (ModuleName.of_ident id) env in
+        let () = Env.add_parameter parent id (ModuleName.of_ident id) env in
         let f_parameter =
           match arg with
           | None -> FunctorParameter.Unit
           | Some arg ->
-              let id = Env.find_parameter_identifier new_env id in
+              let id = Env.find_parameter_identifier env id in
               let arg = Cmti.read_module_type env (id :> Identifier.Signature.t) label_parent arg in
               Named { FunctorParameter. id; expr = arg; }
         in
-        let res = read_module_expr new_env (Identifier.Mk.result parent) label_parent res in
+        let res = read_module_expr env (Identifier.Mk.result parent) label_parent res in
         Functor(f_parameter, res)
 #endif
     | Tmod_apply _ ->

src/loader/implementation.ml

@@ -5,7 +5,7 @@ let rec is_persistent : Path.t -> bool = function
   | Path.Pdot(p, _) -> is_persistent p
   | Path.Papply(p, _) -> is_persistent p
 #if OCAML_VERSION >= (5,1,0)
-  | Path.Pextra_ty -> assert false
+  | Path.Pextra_ty _ -> assert false
 #endif
 
 let pos_of_loc loc = (loc.Location.loc_start.pos_cnum, loc.loc_end.pos_cnum)
@@ -384,7 +384,7 @@ let read_cmt_infos source_id_opt id cmt_info ~count_occurrences =
 
 #else
 
-let read_cmt_infos _source_id_opt _id _cmt_info =
+let read_cmt_infos _source_id_opt _id _cmt_info ~count_occurrences:_ =
   (None, None)
 
 #endif

src/odoc/occurrences.ml

@@ -119,15 +119,15 @@ end = struct
       tbl
 end
 
-let count ~dst ~warnings_options:_ directories include_hidden include_persistent =
+let count ~dst ~warnings_options:_ directories include_hidden include_persistent
+    =
   let htbl = H.create 100 in
   let f () (unit : Odoc_model.Lang.Compilation_unit.t) =
     let incr tbl p persistent =
       let p = (p :> Odoc_model.Paths.Path.Resolved.t) in
       let id = Odoc_model.Paths.Path.Resolved.identifier p in
-      if not (Odoc_model.Paths.Path.Resolved.is_hidden p) || include_hidden then
-        if not persistent || include_persistent then
-          Occtbl.add tbl id
+      if (not (Odoc_model.Paths.Path.Resolved.is_hidden p)) || include_hidden
+      then if (not persistent) || include_persistent then Occtbl.add tbl id
     in
     let () =
       List.iter
@@ -138,9 +138,11 @@ let count ~dst ~warnings_options:_ directories include_hidden include_persistent
               incr htbl p persistent
           | Value { documentation = Some (`Resolved p, persistent); _ }, _ ->
               incr htbl p persistent
-          | ClassType { documentation = Some (`Resolved p, persistent); _ }, _ ->
+          | ClassType { documentation = Some (`Resolved p, persistent); _ }, _
+            ->
               incr htbl p persistent
-          | ModuleType { documentation = Some (`Resolved p, persistent); _ }, _ ->
+          | ModuleType { documentation = Some (`Resolved p, persistent); _ }, _
+            ->
               incr htbl p persistent
           | Type { documentation = Some (`Resolved p, persistent); _ }, _ ->
               incr htbl p persistent

src/xref2/shape_tools.cppo.ml

@@ -176,4 +176,8 @@ type t = unit
 
 let lookup_def _ _id = None
 
+let lookup_value_path _ _id = None
+
+let lookup_module_path _ _id = None
+
 #endif