simplify to_modules handling

Signed-off-by: Javier Chávarri <javier.chavarri@gmail.com>
ocaml · Mar 3, 2023 · 81d3339 · 81d3339
1 parent 559e885
commit 81d3339
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/src/dune_rules/dep_rules.ml b/src/dune_rules/dep_rules.ml
@@ -59,7 +59,6 @@ let deps_of_module ({ modules; _ } as md) ~ml_kind m =
     let+ deps = Ocamldep.deps_of md ~ml_kind m in
     let open Action_builder.O in
     let+ deps = deps in
-    let deps = List.map ~f:Modules.Sourced_module.to_module deps in
     match Modules.alias_for modules m with
     | [] -> deps
     | aliases -> aliases @ deps)
@@ -94,11 +93,7 @@ let deps_of_vlib_module ({ obj_dir; vimpl; dir; sctx; _ } as md) ~ml_kind
     let+ () =
       Super_context.add_rule sctx ~dir (Action_builder.symlink ~src ~dst)
     in
-    let open Action_builder.O in
-    let+ deps =
-      Ocamldep.read_deps_of ~obj_dir:vlib_obj_dir ~modules ~ml_kind m
-    in
-    List.map ~f:Modules.Sourced_module.to_module deps
+    Ocamldep.read_deps_of ~obj_dir:vlib_obj_dir ~modules ~ml_kind m
 
 let rec deps_of md ~ml_kind (m : Modules.Sourced_module.t) =
   let is_alias =

diff --git a/src/dune_rules/ocamldep.ml b/src/dune_rules/ocamldep.ml
@@ -38,7 +38,8 @@ let parse_compilation_units ~modules =
   let obj_map = Modules.obj_map modules in
   List.filter_map ~f:(fun m ->
       let obj_name = Module_name.Unique.of_string m in
-      Module_name.Unique.Map.find obj_map obj_name)
+      Module_name.Unique.Map.find obj_map obj_name
+      |> Option.map ~f:Modules.Sourced_module.to_module)
 
 let parse_deps_exn ~file lines =
   let invalid () =

diff --git a/src/dune_rules/ocamldep.mli b/src/dune_rules/ocamldep.mli
@@ -23,14 +23,14 @@ val deps_of :
      Modules_data.t
   -> ml_kind:Ml_kind.t
   -> Module.t
-  -> Modules.Sourced_module.t list Action_builder.t Memo.t
+  -> Module.t list Action_builder.t Memo.t
 
 val read_deps_of :
      obj_dir:Path.Build.t Obj_dir.t
   -> modules:Modules.t
   -> ml_kind:Ml_kind.t
   -> Module.t
-  -> Modules.Sourced_module.t list Action_builder.t
+  -> Module.t list Action_builder.t
 
 (** [read_immediate_deps_of ~obj_dir ~modules ~ml_kind unit] returns the
     immediate dependencies found in the modules of [modules] for the file with