Solve the missing dev tool package issue

Signed-off-by: Marek Kubica <[email protected]>

Author: Leonidas-from-XIV

src/dune_rules/lock_dir.ml

@@ -273,20 +273,6 @@ let enabled =
          Option.is_some found))
 ;;
 
-let of_dev_tool_if_lock_dir_exists dev_tool =
-  let source_path = dev_tool_source_lock_dir dev_tool in
-  let exists =
-    (* Note we use [Path.Untracked] here rather than [Fs_memo] because a tool's
-       lockdir may be generated part way through a build. *)
-    Path.Untracked.exists (Path.source source_path)
-  in
-  if exists
-  then
-    let+ t = Load.load_exn (Path.source source_path) in
-    Some t
-  else Memo.return None
-;;
-
 let lock_dir_active ctx =
   let* enabled = enabled in
   match enabled with

src/dune_rules/lock_dir.mli

@@ -7,10 +7,6 @@ val get_with_path : Context_name.t -> (Path.t * t, User_message.t) result Memo.t
 val get : Context_name.t -> (t, User_message.t) result Memo.t
 val get_exn : Context_name.t -> t Memo.t
 val of_dev_tool : Dune_pkg.Dev_tool.t -> t Memo.t
-
-(** Returns [None] if the lock_dir for the specified dev tool does not exist. *)
-val of_dev_tool_if_lock_dir_exists : Dune_pkg.Dev_tool.t -> t option Memo.t
-
 val lock_dir_active : Context_name.t -> bool Memo.t
 val get_path : Context_name.t -> Path.t option Memo.t
 

src/dune_rules/pkg_rules.ml

@@ -1312,23 +1312,18 @@ module DB = struct
     let union = Pkg_digest.Map.union ~f:union_check
     let union_all = Pkg_digest.Map.union_all ~f:union_check
 
-    let of_dev_tool_deps_if_lock_dir_exists dev_tool ~platform ~system_provided =
-      let+ lock_dir_opt = Lock_dir.of_dev_tool_if_lock_dir_exists dev_tool in
-      Option.map lock_dir_opt ~f:(of_lock_dir ~platform ~system_provided)
+    let of_dev_tool ~platform ~system_provided dev_tool =
+      let+ lock_dir = Lock_dir.of_dev_tool dev_tool in
+      of_lock_dir ~platform ~system_provided lock_dir
     ;;
 
     let all_existing_dev_tools =
       Memo.lazy_ (fun () ->
         let* platform = Lock_dir.Sys_vars.solver_env () in
-        let+ xs =
-          Memo.List.map
-            Pkg_dev_tool.all
-            ~f:
-              (of_dev_tool_deps_if_lock_dir_exists
-                 ~platform
-                 ~system_provided:default_system_provided)
-        in
-        List.filter_opt xs |> union_all)
+        Memo.List.map
+          Pkg_dev_tool.all
+          ~f:(of_dev_tool ~platform ~system_provided:default_system_provided)
+        >>| union_all)
     ;;
   end