Ident_env: Turn all maps into hashtbl

OCaml Idents are unique, so there is no risk with keeping "out of scope"
idents. However, it is practical to keep the full environment at the end of a
traverse, for render source code purpose.

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

Author: panglesd

src/loader/cmi.ml

@@ -924,17 +924,18 @@ let rec read_module_type env parent (mty : Odoc_model.Compat.module_type) =
     | Mty_ident p -> Path {p_path = Env.Path.read_module_type env p; p_expansion=None }
     | Mty_signature sg -> Signature (read_signature env parent sg)
     | Mty_functor(parameter, res) ->
-        let f_parameter, env =
+        let f_parameter =
           match parameter with
-          | Unit -> Odoc_model.Lang.FunctorParameter.Unit, env
+          | Unit -> Odoc_model.Lang.FunctorParameter.Unit
           | Named (id_opt, arg) ->
-              let id, env = match id_opt with
-                | None -> Identifier.Mk.parameter(parent, Odoc_model.Names.ModuleName.make_std "_"), env
-                | Some id -> let env = Env.add_parameter parent id (ModuleName.of_ident id) env in
-                  Ident_env.find_parameter_identifier env id, env
+              let id = match id_opt with
+                | None -> Identifier.Mk.parameter(parent, Odoc_model.Names.ModuleName.make_std "_")
+                | Some id ->
+                   let () = Env.add_parameter parent id (ModuleName.of_ident id) env in
+                   Ident_env.find_parameter_identifier env id
               in
               let arg = read_module_type env (id :> Identifier.Signature.t) arg in
-              Odoc_model.Lang.FunctorParameter.Named ({ FunctorParameter. id; expr = arg }), env
+              Odoc_model.Lang.FunctorParameter.Named ({ FunctorParameter. id; expr = arg })
         in
         let res = read_module_type env (Identifier.Mk.result parent) res in
         Functor( f_parameter, res)
@@ -1082,7 +1083,7 @@ and read_signature_noenv env parent (items : Odoc_model.Compat.signature) =
     loop ([],{s_modules=[]; s_module_types=[]; s_values=[];s_types=[]; s_classes=[]; s_class_types=[]}) items
 
 and read_signature env parent (items : Odoc_model.Compat.signature) =
-  let env = Env.handle_signature_type_items parent items env in
+  let () = Env.handle_signature_type_items parent items env in
   fst @@ read_signature_noenv env parent items
 
 

src/loader/cmt.ml

@@ -363,19 +363,20 @@ let rec read_module_expr env parent label_parent mexpr =
         Signature sg
 #if OCAML_VERSION >= (4,10,0)
     | Tmod_functor(parameter, res) ->
-        let f_parameter, env =
+        let f_parameter =
           match parameter with
-          | Unit -> FunctorParameter.Unit, env
+          | Unit -> FunctorParameter.Unit
           | Named (id_opt, _, arg) ->
-              let id, env =
+              let id =
                 match id_opt with
-                | None -> Identifier.Mk.parameter (parent, Odoc_model.Names.ModuleName.make_std "_"), env
-                | Some id -> let env = Env.add_parameter parent id (ModuleName.of_ident id) env in
-                  Env.find_parameter_identifier env id, env
+                | None -> Identifier.Mk.parameter (parent, Odoc_model.Names.ModuleName.make_std "_")
+                | Some id ->
+                   let () = Env.add_parameter parent id (ModuleName.of_ident id) env in
+                   Env.find_parameter_identifier env id
               in
               let arg = Cmti.read_module_type env (id :> Identifier.Signature.t) label_parent arg in
 
-              Named { id; expr=arg }, env
+              Named { id; expr=arg }
           in
         let res = read_module_expr env (Identifier.Mk.result parent) label_parent res in
         Functor (f_parameter, res)
@@ -576,7 +577,7 @@ and read_structure :
       'tags. 'tags Odoc_model.Semantics.handle_internal_tags -> _ -> _ -> _ ->
       _ * 'tags =
  fun internal_tags env parent str ->
-  let env = Env.add_structure_tree_items parent str env in
+  let () = Env.add_structure_tree_items parent str env in
   let items, (doc, doc_post), tags =
     let classify item =
       match item.str_desc with

src/loader/cmti.ml

@@ -517,12 +517,12 @@ and read_module_type env parent label_parent mty =
           match parameter with
           | Unit -> FunctorParameter.Unit, env
           | Named (id_opt, _, arg) ->
-            let id, env =
+            let id =
               match id_opt with
-              | None -> Identifier.Mk.parameter (parent, ModuleName.make_std "_"), env
+              | None -> Identifier.Mk.parameter (parent, ModuleName.make_std "_")
               | Some id ->
-                 let env = Env.add_parameter parent id (ModuleName.of_ident id) env in
-                 Env.find_parameter_identifier env id, env
+                 let () = Env.add_parameter parent id (ModuleName.of_ident id) env in
+                 Env.find_parameter_identifier env id
             in
             let arg = read_module_type env (id :> Identifier.Signature.t) label_parent arg in
             Named { id; expr = arg; }, env
@@ -772,7 +772,7 @@ and read_signature :
       'tags. 'tags Odoc_model.Semantics.handle_internal_tags -> _ -> _ -> _ ->
       _ * 'tags =
  fun internal_tags env parent sg ->
-  let env = Env.add_signature_tree_items parent sg env in
+  let () = Env.add_signature_tree_items parent sg env in
   let items, (doc, doc_post), tags =
     let classify item =
       match item.sig_desc with