remove Kind_db

Signed-off-by: Alpha DIALLO <[email protected]>
ocaml · Oct 10, 2022 · db3b493 · db3b493
1 parent 2ca2962
commit db3b493
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 21 deletions.
diff --git a/src/dune_rules/lib.ml b/src/dune_rules/lib.ml
@@ -369,20 +369,12 @@ module Status = struct
     | Found t -> variant "Found" [ to_dyn t ]
 end
 
-module Kind_db = struct
-  type t =
-    | Installed_libs
-    | Public_libs
-    | Project_libs
-end
-
 type db =
   { parent : db option
   ; resolve : Lib_name.t -> resolve_result Memo.t
   ; all : Lib_name.t list Memo.Lazy.t
   ; lib_config : Lib_config.t
   ; instrument_with : Lib_name.t list
-  ; kind : Kind_db.t
   }
 
 and resolve_result =
@@ -1740,13 +1732,12 @@ module DB = struct
 
   type t = db
 
-  let create ~parent ~resolve ~all ~lib_config ~kind () =
+  let create ~parent ~resolve ~all ~lib_config () =
     { parent
     ; resolve
     ; all = Memo.lazy_ all
     ; lib_config
     ; instrument_with = lib_config.Lib_config.instrument_with
-    ; kind
     }
 
   let parent t = t.parent
@@ -1768,7 +1759,6 @@ module DB = struct
       ~all:(fun () ->
         let open Memo.O in
         Findlib.all_packages findlib >>| List.map ~f:Dune_package.Entry.name)
-      ~kind:Kind_db.Installed_libs
 
   let installed (context : Context.t) =
     let open Memo.O in

diff --git a/src/dune_rules/lib.mli b/src/dune_rules/lib.mli
@@ -41,13 +41,6 @@ val hash : t -> int
 
 val project : t -> Dune_project.t option
 
-module Kind_db : sig
-  type t =
-    | Installed_libs
-    | Public_libs
-    | Project_libs
-end
-
 (** Operations on list of libraries *)
 module L : sig
   val top_closure :
@@ -133,7 +126,6 @@ module DB : sig
     -> resolve:(Lib_name.t -> Resolve_result.t Memo.t)
     -> all:(unit -> Lib_name.t list Memo.t)
     -> lib_config:Lib_config.t
-    -> kind:Kind_db.t
     -> unit
     -> t
 

diff --git a/src/dune_rules/scope.ml b/src/dune_rules/scope.ml
@@ -127,7 +127,7 @@ module DB = struct
           | Some (Redirect lib) -> Lib.DB.Resolve_result.redirect None lib
           | Some (Found lib) -> Lib.DB.Resolve_result.found lib))
       ~all:(fun () -> Lib_name.Map.keys map |> Memo.return)
-      ~lib_config ~kind:Lib.Kind_db.Project_libs
+      ~lib_config
 
   type redirect_to =
     | Project of Dune_project.t
@@ -187,7 +187,7 @@ module DB = struct
     let resolve lib = Memo.return (resolve t public_libs lib) in
     Lib.DB.create ~parent:(Some installed_libs) ~resolve
       ~all:(fun () -> Lib_name.Map.keys public_libs |> Memo.return)
-      ~lib_config () ~kind:Lib.Kind_db.Public_libs
+      ~lib_config ()
 
   module Path_source_map_traversals = Memo.Make_map_traversals (Path.Source.Map)