removed Hashtbl from lib.ml + ocaml_index.ml adapted to requires_hidd…

…en (to be re-checked)

Signed-off-by: HasanA <[email protected]>

src/dune_rules/lib.ml

@@ -350,10 +350,6 @@ module T = struct
     Dyn.record
       [ "name", Lib_name.to_dyn t.name; "loc", Loc.to_dyn_hum (Lib_info.loc t.info) ]
   ;;
-
-  (* We can't write a structural equality because of all the lazy fields *)
-  let equal : t -> t -> bool = phys_equal
-  let hash = Poly.hash
 end
 
 include T
@@ -473,8 +469,11 @@ let wrapped t =
      | Some (This x) -> Some x)
 ;;
 
+(* We can't write a structural equality because of all the lazy fields *)
+let equal : t -> t -> bool = phys_equal
+let hash = Poly.hash
+
 include Comparable.Make (T)
-module Tbl = Hashtbl.Make (T)
 
 module L = struct
   let top_closure l ~key ~deps =

src/dune_rules/lib.mli

@@ -235,5 +235,3 @@ module Local : sig
 
   include Comparable_intf.S with type key := t
 end
-
-module Tbl : Hashtbl.S with type key := t

src/dune_rules/merlin/ocaml_index.ml

@@ -32,11 +32,9 @@ let cctx_rules cctx =
 
            The implicit transitive libs correspond to the set:
            (requires_link \ req_compile) *)
-        let* req_link = Compilation_context.requires_link cctx in
-        let+ req_compile = Compilation_context.requires_compile cctx in
-        List.filter req_link ~f:(fun l -> not (List.exists req_compile ~f:(Lib.equal l)))
+        Compilation_context.requires_hidden cctx
       in
-      Lib_flags.L.include_flags non_compile_libs (Lib_mode.Ocaml Byte)
+      Lib_flags.L.include_flags [] non_compile_libs (Lib_mode.Ocaml Byte)
     in
     (* Indexing depends (recursively) on [required_compile] libs:
        - These libs's cmt files should be built before indexing starts