fix after review

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

Author: art-w

src/dune_rules/compilation_context.ml

@@ -78,6 +78,11 @@ let singleton_modules m =
   { modules = Modules.With_vlib.singleton m; dep_graphs = Dep_graph.Ml_kind.dummy m }
 ;;
 
+type implements_parameter =
+  { main_module : Module_name.t
+  ; implements_parameter : Module_name.t option Resolve.Memo.t
+  }
+
 type t =
   { super_context : Super_context.t
   ; scope : Scope.t
@@ -87,7 +92,7 @@ type t =
   ; requires_compile : Lib.t list Resolve.Memo.t
   ; requires_hidden : Lib.t list Resolve.Memo.t
   ; requires_link : Lib.t list Resolve.t Memo.Lazy.t
-  ; implements_parameter : (Module_name.t * Module_name.t option Resolve.Memo.t) option
+  ; implements_parameter : implements_parameter option
   ; includes : Includes.t
   ; preprocessing : Pp_spec.t
   ; opaque : bool
@@ -131,7 +136,8 @@ let ocaml t = t.ocaml
 
 let implements_parameter t m =
   match t.implements_parameter with
-  | Some (root, implements) when Module_name.equal root (Module.name m) -> implements
+  | Some { main_module; implements_parameter }
+    when Module_name.equal main_module (Module.name m) -> implements_parameter
   | _ -> Resolve.Memo.return None
 ;;
 

src/dune_rules/compilation_context.mli

@@ -18,6 +18,11 @@ type opaque =
   | Explicit of bool (** Set directly by the caller *)
   | Inherit_from_settings (** Determined from the version of OCaml and the profile *)
 
+type implements_parameter =
+  { main_module : Module_name.t
+  ; implements_parameter : Module_name.t option Resolve.Memo.t
+  }
+
 (** Create a compilation context. *)
 val create
   :  super_context:Super_context.t
@@ -27,7 +32,7 @@ val create
   -> flags:Ocaml_flags.t
   -> requires_compile:Lib.t list Resolve.Memo.t
   -> requires_link:Lib.t list Resolve.t Memo.Lazy.t
-  -> ?implements_parameter:Module_name.t * Module_name.t option Resolve.Memo.t
+  -> ?implements_parameter:implements_parameter
   -> ?preprocessing:Pp_spec.t
   -> opaque:opaque
   -> ?stdlib:Ocaml_stdlib.t

src/dune_rules/install_rules.ml

@@ -100,12 +100,13 @@ end = struct
       match Lib_info.kind lib with
       | Dune_file _ ->
         Memo.return (Mode.Map.Multi.to_flat_list @@ Lib_info.foreign_archives lib)
-      | Parameter | Virtual ->
+      | Virtual ->
         let+ foreign_sources = Dir_contents.foreign_sources dir_contents in
         let name = Lib_info.name lib in
         let files = Foreign_sources.for_lib foreign_sources ~name in
         let { Lib_config.ext_obj; _ } = lib_config in
         Foreign.Sources.object_files files ~dir ~ext_obj
+      | Parameter -> Memo.return []
     in
     List.rev_append
       (List.rev_concat_map

src/dune_rules/lib_rules.ml

@@ -507,8 +507,11 @@ let cctx (lib : Library.t) ~sctx ~source_modules ~dir ~expander ~scope ~compile_
       let vlib = Vimpl.vlib vimpl in
       (match Lib_info.kind (Lib.info vlib) with
        | Parameter ->
-         let root_module = Module_name.of_local_lib_name lib.name in
-         Some (root_module, Lib.main_module_name vlib)
+         let main_module = Module_name.of_local_lib_name lib.name in
+         Some
+           { Compilation_context.main_module
+           ; implements_parameter = Lib.main_module_name vlib
+           }
        | _ -> None)
   in
   let modules = Vimpl.impl_modules vimpl modules in

src/dune_rules/ml_sources.ml

@@ -368,7 +368,7 @@ let make_lib_modules
         | Dune_file _, None -> Exe_or_normal_lib
         | Parameter, None -> Parameter
         | Virtual, Some virtual_modules -> Virtual { virtual_modules }
-        | _ -> assert false
+        | (Dune_file _ | Parameter), Some _ | Virtual, None -> assert false
       in
       Memo.return (Resolve.return (kind, main_module_name, wrapped))
     | Some _ ->

src/dune_rules/module.ml

@@ -288,7 +288,7 @@ let map_files t ~f =
 let src_dir t = Source.src_dir t.source
 let set_pp t pp = { t with pp }
 
-let to_dyn { source; obj_name; pp; visibility; kind; install_as; _ } =
+let to_dyn { source; obj_name; pp; visibility; kind; install_as } =
   Dyn.record
     [ "source", Source.to_dyn source
     ; "obj_name", Module_name.Unique.to_dyn obj_name
@@ -345,10 +345,7 @@ module Obj_map = struct
     end)
 end
 
-let encode
-      ({ source; obj_name; pp = _; visibility; kind; install_as = _; _ } as t)
-      ~src_dir
-  =
+let encode ({ source; obj_name; pp = _; visibility; kind; install_as = _ } as t) ~src_dir =
   let open Dune_lang.Encoder in
   let has_impl = has t ~ml_kind:Impl in
   let kind =