Revert "Avoid possibly unmatched pkg_name and pkg_dir"

This reverts commit eef2240.

Author: jonludlam

src/driver/compile.ml

@@ -17,17 +17,18 @@ type compiled = {
   include_dirs : Fpath.Set.t;
   impl : impl option;
   pkg_args : pkg_args;
-  pkgdir : Packages.pkgdir;
+  pkg_name : string;
+  pkg_dir : Fpath.t;
 }
 
 let mk_byhash (pkgs : Packages.t Util.StringMap.t) =
   Util.StringMap.fold
-    (fun _pkgname pkg acc ->
+    (fun pkgname pkg acc ->
       List.fold_left
         (fun acc (lib : Packages.libty) ->
           List.fold_left
             (fun acc (m : Packages.modulety) ->
-              Util.StringMap.add m.m_intf.mif_hash m acc)
+              Util.StringMap.add m.m_intf.mif_hash (pkgname, m) acc)
             acc lib.modules)
         acc pkg.Packages.libraries)
     pkgs Util.StringMap.empty
@@ -68,7 +69,8 @@ let init_stats (pkgs : Packages.t Util.StringMap.t) =
 
 open Eio.Std
 
-type partial = (string * compiled) list * Packages.modulety Util.StringMap.t
+type partial =
+  (string * compiled) list * (string * Packages.modulety) Util.StringMap.t
 
 let unmarshal filename : partial =
   let ic = open_in_bin (Fpath.to_string filename) in
@@ -140,7 +142,7 @@ let compile ?partial ~output_dir ?linked_dir all =
     | None ->
         Logs.debug (fun m -> m "Error locating hash: %s" hash);
         Error Not_found
-    | Some modty ->
+    | Some (package_name, modty) ->
         let deps = modty.m_intf.mif_deps in
         let odoc_file = Fpath.(output_dir // modty.m_intf.mif_odoc_file) in
         let odocl_file = Fpath.(linked_dir // modty.m_intf.mif_odocl_file) in
@@ -200,7 +202,8 @@ let compile ?partial ~output_dir ?linked_dir all =
             include_dirs = includes;
             impl;
             pkg_args;
-            pkgdir = modty.m_pkg;
+            pkg_dir = modty.m_pkg_dir;
+            pkg_name = package_name;
           }
   in
 
@@ -226,7 +229,7 @@ let compile ?partial ~output_dir ?linked_dir all =
   in
   let result =
     Util.StringMap.fold
-      (fun _pkgname (pkg : Packages.t) acc ->
+      (fun package_name (pkg : Packages.t) acc ->
         Logs.debug (fun m ->
             m "Package %s mlds: [%a]" pkg.name
               Fmt.(list ~sep:sp Packages.pp_mld)
@@ -255,7 +258,8 @@ let compile ?partial ~output_dir ?linked_dir all =
               include_dirs;
               impl = None;
               pkg_args;
-              pkgdir = mld.mld_pkg;
+              pkg_dir = mld.mld_pkg_dir;
+              pkg_name = package_name;
             }
             :: acc)
           acc pkg.mlds)
@@ -267,21 +271,17 @@ let compile ?partial ~output_dir ?linked_dir all =
   | None -> ());
   result
 
-type linked = {
-  output_file : Fpath.t;
-  src : Fpath.t option;
-  pkgdir : Packages.pkgdir;
-}
+type linked = { output_file : Fpath.t; src : Fpath.t option; pkg_dir : Fpath.t }
 
 let link : compiled list -> _ =
  fun compiled ->
   let link : compiled -> linked list =
    fun c ->
     let includes = Fpath.Set.add c.odoc_output_dir c.include_dirs in
     let link input_file output_file =
-      let { pkg_args = { libs; docs }; pkgdir = current_package, _; _ } = c in
-      Odoc.link ~input_file ~output_file ~includes ~libs ~docs ~current_package
-        ()
+      let { pkg_args = { libs; docs }; pkg_name; _ } = c in
+      Odoc.link ~input_file ~output_file ~includes ~libs ~docs
+        ~current_package:pkg_name ()
     in
     let impl =
       match c.impl with
@@ -290,7 +290,7 @@ let link : compiled list -> _ =
               m "Linking impl: %a -> %a" Fpath.pp impl_odoc Fpath.pp impl_odocl);
           link impl_odoc impl_odocl;
           Atomic.incr Stats.stats.linked_impls;
-          [ { pkgdir = c.pkgdir; output_file = impl_odocl; src = Some src } ]
+          [ { pkg_dir = c.pkg_dir; output_file = impl_odocl; src = Some src } ]
       | None -> []
     in
     match c.m with
@@ -303,12 +303,12 @@ let link : compiled list -> _ =
         (match c.m with
         | Module _ -> Atomic.incr Stats.stats.linked_units
         | Mld _ -> Atomic.incr Stats.stats.linked_mlds);
-        { output_file = c.odocl_file; src = None; pkgdir = c.pkgdir } :: impl
+        { output_file = c.odocl_file; src = None; pkg_dir = c.pkg_dir } :: impl
   in
   Fiber.List.map link compiled |> List.concat
 
 let index_one ~odocl_dir pkgname pkg =
-  let _, dir = pkg.Packages.pkgdir in
+  let dir = pkg.Packages.pkg_dir in
   let output_file = Fpath.(odocl_dir // dir / Odoc.index_filename) in
   let libs =
     List.map
@@ -322,9 +322,10 @@ let index_one ~odocl_dir pkgname pkg =
 let index ~odocl_dir pkgs = Util.StringMap.iter (index_one ~odocl_dir) pkgs
 
 let sherlodoc_index_one ~html_dir ~odocl_dir _ pkg_content =
-  let _, pkg_dir = pkg_content.Packages.pkgdir in
-  let inputs = [ Fpath.(odocl_dir // pkg_dir / Odoc.index_filename) ] in
-  let dst = Fpath.(html_dir // Sherlodoc.db_js_file pkg_dir) in
+  let inputs =
+    [ Fpath.(odocl_dir // pkg_content.Packages.pkg_dir / Odoc.index_filename) ]
+  in
+  let dst = Fpath.(html_dir // Sherlodoc.db_js_file pkg_content.pkg_dir) in
   let dst_dir, _ = Fpath.split_base dst in
   Util.mkdir_p dst_dir;
   Sherlodoc.index ~format:`js ~inputs ~dst ()
@@ -340,17 +341,15 @@ let sherlodoc ~html_dir ~odocl_dir pkgs =
   let inputs =
     pkgs |> Util.StringMap.bindings
     |> List.map (fun (_pkgname, pkg) ->
-           let _, pkg_dir = pkg.Packages.pkgdir in
-           Fpath.(odocl_dir // pkg_dir / Odoc.index_filename))
+           Fpath.(odocl_dir // pkg.Packages.pkg_dir / Odoc.index_filename))
   in
   Sherlodoc.index ~format ~inputs ~dst ()
 
 let html_generate output_dir ~odocl_dir linked =
   let html_generate : linked -> unit =
    fun l ->
-    let _, pkg_dir = l.pkgdir in
-    let search_uris = [ Sherlodoc.db_js_file pkg_dir; Sherlodoc.js_file ] in
-    let index = Some Fpath.(odocl_dir // pkg_dir / Odoc.index_filename) in
+    let search_uris = [ Sherlodoc.db_js_file l.pkg_dir; Sherlodoc.js_file ] in
+    let index = Some Fpath.(odocl_dir // l.pkg_dir / Odoc.index_filename) in
     Odoc.html_generate ~search_uris ?index
       ~output_dir:(Fpath.to_string output_dir)
       ~input_file:l.output_file ?source:l.src ();

src/driver/dune_style.ml

@@ -34,17 +34,16 @@ let of_dune_build dir =
             let cmtidir =
               Fpath.(path / Printf.sprintf ".%s.objs" libname / "byte")
             in
-            (* Map lib names to package names. *)
-            let pkgdir = (libname, Fpath.rem_prefix dir path |> Option.get) in
-            ( pkgdir,
-              Packages.Lib.v ~pkgdir
+            let pkg_dir = Fpath.rem_prefix dir path |> Option.get in
+            ( pkg_dir,
+              Packages.Lib.v ~pkg_dir
                 ~libname_of_archive:(Util.StringMap.singleton libname libname)
-                ~dir:path ~cmtidir:(Some cmtidir) ))
+                ~pkg_name:libname ~dir:path ~cmtidir:(Some cmtidir) ))
           libs
       in
       let packages =
         List.filter_map
-          (fun (pkgdir, lib) ->
+          (fun (pkg_dir, lib) ->
             match lib with
             | [ lib ] ->
                 Some
@@ -55,7 +54,7 @@ let of_dune_build dir =
                       libraries = [ lib ];
                       mlds = [];
                       mld_odoc_dir = Fpath.v lib.Packages.lib_name;
-                      pkgdir;
+                      pkg_dir;
                       other_docs = Fpath.Set.empty;
                     } )
             | _ -> None)

src/driver/packages.ml

@@ -1,7 +1,5 @@
 (* Packages *)
 
-type pkgdir = string * Fpath.t
-
 type dep = string * Digest.t
 
 type id = Odoc.id
@@ -34,7 +32,7 @@ type modulety = {
   m_intf : intf;
   m_impl : impl option;
   m_hidden : bool;
-  m_pkg : pkgdir;
+  m_pkg_dir : Fpath.t;
       (* The 'top dir' of a package, relative to [_odoc] or [_html] *)
 }
 
@@ -44,7 +42,7 @@ type mld = {
   mld_parent_id : id;
   mld_path : Fpath.t; (* Absolute or relative to cwd *)
   mld_deps : Fpath.t list;
-  mld_pkg : pkgdir;
+  mld_pkg_dir : Fpath.t;
       (* The 'top dir' of a package, relative to [_odoc] or [_html] *)
 }
 
@@ -63,21 +61,20 @@ type t = {
   libraries : libty list;
   mlds : mld list;
   mld_odoc_dir : Fpath.t; (* Relative to [odoc] dir *)
-  pkgdir : pkgdir;
+  pkg_dir : Fpath.t;
   other_docs : Fpath.Set.t;
 }
 
 let maybe_prepend_top top_dir dir =
   match top_dir with None -> dir | Some d -> Fpath.(d // dir)
 
-let find_pkg top_dir pkg_name =
-  (pkg_name, maybe_prepend_top top_dir Fpath.(v pkg_name))
+let pkg_dir top_dir pkg_name = maybe_prepend_top top_dir Fpath.(v pkg_name)
 
-let parent_of_lib (_, pkg_dir) lib_name = Fpath.(pkg_dir / "lib" / lib_name)
+let parent_of_lib pkg_dir lib_name = Fpath.(pkg_dir / "lib" / lib_name)
 
-let parent_of_pages (_, pkg_dir) = Fpath.(pkg_dir / "doc")
+let parent_of_pages pkg_dir = Fpath.(pkg_dir / "doc")
 
-let parent_of_src (_, pkg_dir) lib_name = Fpath.(pkg_dir / "src" / lib_name)
+let parent_of_src pkg_dir lib_name = Fpath.(pkg_dir / "src" / lib_name)
 
 module Module = struct
   type t = modulety
@@ -88,7 +85,7 @@ module Module = struct
 
   let is_hidden name = Astring.String.is_infix ~affix:"__" name
 
-  let vs pkgdir lib_name libsdir cmtidir modules =
+  let vs pkg_dir lib_name libsdir cmtidir modules =
     let dir = match cmtidir with None -> libsdir | Some dir -> dir in
     let mk m_name =
       let exists ext =
@@ -108,7 +105,7 @@ module Module = struct
             | _ -> None)
       in
       let mk_intf mif_path =
-        let mif_parent_id = parent_of_lib pkgdir lib_name in
+        let mif_parent_id = parent_of_lib pkg_dir lib_name in
         let mif_odoc_file =
           Fpath.(
             mif_parent_id
@@ -128,7 +125,7 @@ module Module = struct
         | Error _ -> failwith "bad deps"
       in
       let mk_impl mip_path =
-        let mip_parent_id = parent_of_lib pkgdir lib_name in
+        let mip_parent_id = parent_of_lib pkg_dir lib_name in
         let mip_odoc_file =
           Fpath.(
             mip_parent_id
@@ -151,7 +148,7 @@ module Module = struct
                   m "Found source file %a for %s" Fpath.pp src_path m_name);
               let src_name = Fpath.filename src_path in
               let src_id =
-                Fpath.(parent_of_src pkgdir lib_name / src_name)
+                Fpath.(parent_of_src pkg_dir lib_name / src_name)
                 |> Odoc.id_of_fpath
               in
               Some { src_path; src_id }
@@ -169,7 +166,7 @@ module Module = struct
       let m_hidden = is_hidden m_name in
       try
         let r (m_intf, m_impl) =
-          Some { m_name; m_intf; m_impl; m_hidden; m_pkg = pkgdir }
+          Some { m_name; m_intf; m_impl; m_hidden; m_pkg_dir = pkg_dir }
         in
         match state with
         | Some cmt, Some cmti -> r (mk_intf cmti, Some (mk_impl cmt))
@@ -187,8 +184,7 @@ module Module = struct
 end
 
 module Lib = struct
-  let v ~pkgdir ~libname_of_archive ~dir ~cmtidir =
-    let pkg_name, _ = pkgdir in
+  let v ~pkg_dir ~libname_of_archive ~pkg_name ~dir ~cmtidir =
     Logs.debug (fun m ->
         m "Classifying dir %a for package %s" Fpath.pp dir pkg_name);
     let dirs =
@@ -215,8 +211,8 @@ module Lib = struct
                   m "Defaulting to name of library: %s" archive_name);
               archive_name
           in
-          let modules = Module.vs pkgdir lib_name dir cmtidir modules in
-          let odoc_dir = parent_of_lib pkgdir lib_name in
+          let modules = Module.vs pkg_dir lib_name dir cmtidir modules in
+          let odoc_dir = parent_of_lib pkg_dir lib_name in
           Some { lib_name; odoc_dir; archive_name; modules }
         with _ ->
           Logs.err (fun m ->
@@ -339,8 +335,8 @@ let of_libs ~packages_dir libs =
         match rel_path with
         | None -> acc
         | Some rel_path ->
-            let pkgdir = find_pkg packages_dir pkg_name in
-            let id = Fpath.(parent_of_pages pkgdir // rel_path) in
+            let pkg_dir = pkg_dir packages_dir pkg_name in
+            let id = Fpath.(parent_of_pages pkg_dir // rel_path) in
             let mld_parent_id = id |> Fpath.parent |> Fpath.rem_empty_seg in
             let page_name = Fpath.(rem_ext mld_path |> filename) in
             let odoc_file =
@@ -354,7 +350,7 @@ let of_libs ~packages_dir libs =
               mld_parent_id = Odoc.id_of_fpath mld_parent_id;
               mld_path;
               mld_deps;
-              mld_pkg = pkgdir;
+              mld_pkg_dir = pkg_dir;
             }
             :: acc)
       odoc_pages []
@@ -373,10 +369,11 @@ let of_libs ~packages_dir libs =
           Logs.debug (fun m -> m "No package for dir %a\n%!" Fpath.pp dir);
           acc
       | Some pkg ->
-          let pkgdir = find_pkg packages_dir pkg.name in
+          let pkg_dir = pkg_dir packages_dir pkg.name in
 
           let libraries =
-            Lib.v ~pkgdir ~libname_of_archive ~dir ~cmtidir:None
+            Lib.v ~pkg_dir ~libname_of_archive ~pkg_name:pkg.name ~dir
+              ~cmtidir:None
           in
           let libraries =
             List.filter
@@ -407,7 +404,7 @@ let of_libs ~packages_dir libs =
                       mlds = update_mlds pkg.mlds libraries;
                     }
               | None ->
-                  let mld_odoc_dir = parent_of_pages pkgdir in
+                  let mld_odoc_dir = parent_of_pages pkg_dir in
                   Some
                     {
                       name = pkg.name;
@@ -416,7 +413,7 @@ let of_libs ~packages_dir libs =
                       mlds;
                       mld_odoc_dir;
                       other_docs;
-                      pkgdir;
+                      pkg_dir;
                     })
             acc)
     dirs Util.StringMap.empty