refactor: move modules: Modules.t from Dune_package.Lib to Lib_info

src/dune_rules/dir_contents.ml

@@ -468,10 +468,11 @@ end
 include Load
 
 let modules_of_lib sctx lib =
-  let dir = Lib_info.src_dir (Lib.info lib) in
-  match Path.as_in_build_dir dir with
-  | None -> Memo.return None
-  | Some dir ->
+  let info = Lib.info lib in
+  match Lib_info.modules info with
+  | External modules -> Memo.return modules
+  | Local ->
+    let dir = Lib_info.src_dir info |> Path.as_in_build_dir_exn in
     let* t = get sctx ~dir in
     let+ ml_sources = ocaml t in
     let name = Lib.name lib in

src/dune_rules/dune_file.ml

@@ -988,8 +988,8 @@ module Library = struct
       ~requires ~foreign_objects ~plugins ~archives ~ppx_runtime_deps
       ~foreign_archives ~native_archives ~foreign_dll_files ~jsoo_runtime
       ~jsoo_archive ~preprocess ~enabled ~virtual_deps ~dune_version ~virtual_
-      ~entry_modules ~implements ~default_implementation ~modes ~wrapped
-      ~special_builtin_support ~exit_module ~instrumentation_backend
+      ~entry_modules ~implements ~default_implementation ~modes ~modules:Local
+      ~wrapped ~special_builtin_support ~exit_module ~instrumentation_backend
 end
 
 module Plugin = struct

src/dune_rules/dune_package.ml

@@ -9,29 +9,27 @@ let fn = "dune-package"
 module Lib = struct
   type t =
     { info : Path.t Lib_info.t
-    ; modules : Modules.t option
     ; main_module_name : Module_name.t option
     }
 
-  let make ~info ~main_module_name ~modules =
+  let make ~info ~main_module_name =
     let obj_dir = Lib_info.obj_dir info in
     let dir = Obj_dir.dir obj_dir in
     let map_path p =
       if Path.is_managed p then Path.relative dir (Path.basename p) else p
     in
     let info = Lib_info.map_path info ~f:map_path in
-    { info; main_module_name; modules }
+    { info; main_module_name }
 
-  let of_dune_lib ~info ~main_module_name ~modules =
-    make ~info ~main_module_name ~modules:(Some modules)
+  let of_dune_lib ~info ~main_module_name = make ~info ~main_module_name
 
-  let of_findlib info = make ~info ~main_module_name:None ~modules:None
+  let of_findlib info = make ~info ~main_module_name:None
 
   let dir_of_name name =
     let _, components = Lib_name.split name in
     Path.Local.L.relative Path.Local.root components
 
-  let encode ~package_root { info; main_module_name; modules } =
+  let encode ~package_root { info; main_module_name } =
     let open Dune_lang.Encoder in
     let no_loc f (_loc, x) = f x in
     let path = Dpath.Local.encode ~dir:package_root in
@@ -59,6 +57,11 @@ module Lib = struct
       | External e -> e
       | Local -> assert false
     in
+    let modules =
+      match Lib_info.modules info with
+      | External ms -> ms
+      | Local -> None
+    in
     let jsoo_runtime = Lib_info.jsoo_runtime info in
     let virtual_ = Option.is_some (Lib_info.virtual_ info) in
     let instrumentation_backend = Lib_info.instrumentation_backend info in
@@ -189,31 +192,32 @@ module Lib = struct
          in
          let entry_modules = Lib_info.Source.External (Ok entry_modules) in
          let modes = { Lib_mode.Map.ocaml = modes; melange = false } in
+         let modules = Lib_info.Source.External (Some modules) in
          Lib_info.create ~path_kind:External ~loc ~name ~kind ~status ~src_dir
            ~orig_src_dir ~obj_dir ~version ~synopsis ~main_module_name
            ~sub_systems ~requires ~foreign_objects ~plugins ~archives
            ~ppx_runtime_deps ~foreign_archives
            ~native_archives:(Files native_archives) ~foreign_dll_files:[]
            ~jsoo_runtime ~jsoo_archive ~preprocess ~enabled ~virtual_deps
            ~dune_version ~virtual_ ~entry_modules ~implements
-           ~default_implementation ~modes ~wrapped ~special_builtin_support
-           ~exit_module:None ~instrumentation_backend
+           ~default_implementation ~modes ~modules ~wrapped
+           ~special_builtin_support ~exit_module:None ~instrumentation_backend
        in
-       { info; main_module_name; modules = Some modules })
-
-  let modules t = t.modules
+       { info; main_module_name })
 
   let main_module_name t = t.main_module_name
 
-  let wrapped t = Option.map t.modules ~f:Modules.wrapped
+  let wrapped t =
+    match Lib_info.modules t.info with
+    | External modules -> Option.map modules ~f:Modules.wrapped
+    | Local -> None
 
   let info dp = dp.info
 
-  let to_dyn { info; modules; main_module_name } =
+  let to_dyn { info; main_module_name } =
     let open Dyn in
     record
       [ ("info", Lib_info.to_dyn Path.to_dyn info)
-      ; ("modules", option Modules.to_dyn modules)
       ; ("main_module_name", option Module_name.to_dyn main_module_name)
       ]
 end

src/dune_rules/dune_package.mli

@@ -8,8 +8,6 @@ val fn : string
 module Lib : sig
   type t
 
-  val modules : t -> Modules.t option
-
   val main_module_name : t -> Module_name.t option
 
   val dir_of_name : Lib_name.t -> Path.Local.t
@@ -21,10 +19,7 @@ module Lib : sig
   val of_findlib : Path.t Lib_info.t -> t
 
   val of_dune_lib :
-       info:Path.t Lib_info.t
-    -> main_module_name:Module_name.t option
-    -> modules:Modules.t
-    -> t
+    info:Path.t Lib_info.t -> main_module_name:Module_name.t option -> t
 
   val to_dyn : t Dyn.builder
 end

src/dune_rules/findlib/findlib.ml

@@ -438,14 +438,15 @@ end = struct
                         | Ok s -> Ok (Some s)
                         | Error e -> Error (User_error.E e)))))
         in
+        let modules = Lib_info.Source.External None in
         Lib_info.create ~path_kind:External ~loc ~name:t.name ~kind ~status
           ~src_dir ~orig_src_dir ~obj_dir ~version ~synopsis ~main_module_name
           ~sub_systems ~requires ~foreign_objects ~plugins ~archives
           ~ppx_runtime_deps ~foreign_archives
           ~native_archives:(Files native_archives) ~foreign_dll_files:[]
           ~jsoo_runtime ~jsoo_archive ~preprocess ~enabled ~virtual_deps
           ~dune_version ~virtual_ ~implements ~default_implementation ~modes
-          ~wrapped ~special_builtin_support ~exit_module:None
+          ~modules ~wrapped ~special_builtin_support ~exit_module:None
           ~instrumentation_backend:None ~entry_modules
       in
       Dune_package.Lib.of_findlib info

src/dune_rules/lib.ml

@@ -1945,7 +1945,7 @@ let to_dune_lib ({ info; _ } as lib) ~modules ~foreign_objects ~dir :
       ~foreign_objects ~obj_dir ~implements ~default_implementation ~sub_systems
       ~modules
   in
-  Dune_package.Lib.of_dune_lib ~info ~modules ~main_module_name
+  Dune_package.Lib.of_dune_lib ~info ~main_module_name
 
 module Local : sig
   type t = private lib

src/dune_rules/lib_info.ml

@@ -320,6 +320,7 @@ type 'path t =
   ; wrapped : Wrapped.t Inherited.t option
   ; main_module_name : Main_module_name.t
   ; modes : Lib_mode.Map.Set.t
+  ; modules : Modules.t option Source.t
   ; special_builtin_support : Special_builtin_support.t option
   ; exit_module : Module_name.t option
   ; instrumentation_backend : (Loc.t * Lib_name.t) option
@@ -358,6 +359,7 @@ let equal (type a) (t : a t)
     ; wrapped
     ; main_module_name
     ; modes
+    ; modules
     ; special_builtin_support
     ; exit_module
     ; instrumentation_backend
@@ -410,6 +412,7 @@ let equal (type a) (t : a t)
   && Option.equal (Inherited.equal Wrapped.equal) wrapped t.wrapped
   && Main_module_name.equal main_module_name t.main_module_name
   && Lib_mode.Map.Set.equal modes t.modes
+  && Source.equal (Option.equal Modules.equal) modules t.modules
   && Option.equal Special_builtin_support.equal special_builtin_support
        t.special_builtin_support
   && Option.equal Module_name.equal exit_module t.exit_module
@@ -436,6 +439,8 @@ let sub_systems t = t.sub_systems
 
 let modes t = t.modes
 
+let modules t = t.modules
+
 let archives t = t.archives
 
 let foreign_archives t = t.foreign_archives
@@ -513,6 +518,7 @@ let for_dune_package t ~name ~ppx_runtime_deps ~requires ~foreign_objects
   let native_archives =
     Files (eval_native_archives_exn t ~modules:(Some modules))
   in
+  let modules = Source.External (Some modules) in
   { t with
     ppx_runtime_deps
   ; name
@@ -524,6 +530,7 @@ let for_dune_package t ~name ~ppx_runtime_deps ~requires ~foreign_objects
   ; sub_systems
   ; orig_src_dir
   ; native_archives
+  ; modules
   }
 
 let user_written_deps t =
@@ -535,7 +542,7 @@ let create ~loc ~path_kind ~name ~kind ~status ~src_dir ~orig_src_dir ~obj_dir
     ~plugins ~archives ~ppx_runtime_deps ~foreign_archives ~native_archives
     ~foreign_dll_files ~jsoo_runtime ~jsoo_archive ~preprocess ~enabled
     ~virtual_deps ~dune_version ~virtual_ ~entry_modules ~implements
-    ~default_implementation ~modes ~wrapped ~special_builtin_support
+    ~default_implementation ~modes ~modules ~wrapped ~special_builtin_support
     ~exit_module ~instrumentation_backend =
   { loc
   ; name
@@ -567,6 +574,7 @@ let create ~loc ~path_kind ~name ~kind ~status ~src_dir ~orig_src_dir ~obj_dir
   ; implements
   ; default_implementation
   ; modes
+  ; modules
   ; wrapped
   ; special_builtin_support
   ; exit_module
@@ -642,6 +650,7 @@ let to_dyn path
     ; implements
     ; default_implementation
     ; modes
+    ; modules
     ; wrapped
     ; special_builtin_support
     ; exit_module
@@ -683,6 +692,7 @@ let to_dyn path
     ; ("wrapped", option (Inherited.to_dyn Wrapped.to_dyn) wrapped)
     ; ("main_module_name", Main_module_name.to_dyn main_module_name)
     ; ("modes", Lib_mode.Map.Set.to_dyn modes)
+    ; ("modules", Source.to_dyn (Dyn.option Modules.to_dyn) modules)
     ; ( "special_builtin_support"
       , option Special_builtin_support.to_dyn special_builtin_support )
     ; ("exit_module", option Module_name.to_dyn exit_module)

src/dune_rules/lib_info.mli

@@ -150,6 +150,8 @@ val special_builtin_support : _ t -> Special_builtin_support.t option
 
 val modes : _ t -> Lib_mode.Map.Set.t
 
+val modules : _ t -> Modules.t option Source.t
+
 val implements : _ t -> (Loc.t * Lib_name.t) option
 
 val requires : _ t -> Lib_dep.t list
@@ -236,6 +238,7 @@ val create :
   -> implements:(Loc.t * Lib_name.t) option
   -> default_implementation:(Loc.t * Lib_name.t) option
   -> modes:Lib_mode.Map.Set.t
+  -> modules:Modules.t option Source.t
   -> wrapped:Wrapped.t Inherited.t option
   -> special_builtin_support:Special_builtin_support.t option
   -> exit_module:Module_name.t option