Driver: added named arguments for readability

Signed-off-by: Paul-Elliot <[email protected]>

Author: panglesd

src/driver/dune_style.ml

@@ -36,9 +36,9 @@ let of_dune_build dir =
             in
             let pkg_dir = Fpath.rem_prefix dir path |> Option.get in
             ( pkg_dir,
-              Packages.Lib.v pkg_dir
-                (Util.StringMap.singleton libname libname)
-                libname path (Some cmtidir) ))
+              Packages.Lib.v ~pkg_dir
+                ~libname_of_archive:(Util.StringMap.singleton libname libname)
+                ~pkg_name:libname ~dir:path ~cmtidir:(Some cmtidir) ))
           libs
       in
       let packages =

src/driver/odoc_driver.ml

@@ -509,15 +509,15 @@ let run libs verbose packages_dir odoc_dir odocl_dir html_dir stats nb_workers
 
   let all =
     match (voodoo, package_name, dune_style, packages_dir) with
-    | true, Some p, None, None -> Voodoo.of_voodoo p blessed
+    | true, Some p, None, None -> Voodoo.of_voodoo p ~blessed
     | false, None, Some dir, None -> Dune_style.of_dune_build dir
     | false, None, None, packages_dir ->
         let libs = if libs = [] then Ocamlfind.all () else libs in
         let libs =
           List.map Ocamlfind.sub_libraries libs
           |> List.fold_left Util.StringSet.union Util.StringSet.empty
         in
-        Packages.of_libs packages_dir libs
+        Packages.of_libs ~packages_dir libs
     | true, None, _, _ -> failwith "--voodoo requires --package-name"
     | false, Some _, _, _ -> failwith "--package-name requires --voodoo"
     | true, _, _, Some _ | false, _, Some _, Some _ ->

src/driver/packages.ml

@@ -184,7 +184,7 @@ module Module = struct
 end
 
 module Lib = struct
-  let v pkg_dir libname_of_archive pkg_name dir cmtidir =
+  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 =
@@ -233,7 +233,7 @@ let pp ppf t =
     Fmt.(list ~sep:sp Lib.pp)
     t.libraries
 
-let of_libs packages_dir libs =
+let of_libs ~packages_dir libs =
   let libs = Util.StringSet.to_seq libs |> List.of_seq in
   let results = List.map (fun x -> (x, Ocamlfind.deps [ x ])) libs in
   let all_libs_set =
@@ -371,7 +371,10 @@ let of_libs packages_dir libs =
       | Some pkg ->
           let pkg_dir = pkg_dir packages_dir pkg.name in
 
-          let libraries = Lib.v pkg_dir libname_of_archive pkg.name dir None in
+          let libraries =
+            Lib.v ~pkg_dir ~libname_of_archive ~pkg_name:pkg.name ~dir
+              ~cmtidir:None
+          in
           let libraries =
             List.filter
               (fun l -> Util.StringSet.mem l.archive_name archives)

src/driver/packages.mli

@@ -67,6 +67,18 @@ type libty = {
   modules : modulety list;
 }
 
+val parent_of_pkg : Fpath.t -> Fpath.t
+
+module Lib : sig
+  val v :
+    pkg_dir:Fpath.t ->
+    libname_of_archive:string Util.StringMap.t ->
+    pkg_name:string ->
+    dir:Fpath.t ->
+    cmtidir:Fpath.t option ->
+    libty list
+end
+
 type t = {
   name : string;
   version : string;
@@ -82,17 +94,5 @@ val pp : Format.formatter -> t -> unit
 
 type set = t Util.StringMap.t
 
-val of_libs : Fpath.t option -> Util.StringSet.t -> set
 (** Turns a set of libraries into a map from library name to package *)
-
-val parent_of_pkg : Fpath.t -> Fpath.t
-
-module Lib : sig
-  val v :
-    Fpath.t ->
-    string Util.StringMap.t ->
-    string ->
-    Fpath.t ->
-    Fpath.t option ->
-    libty list
-end
+val of_libs : packages_dir:Fpath.t option -> Util.StringSet.t -> set

src/driver/voodoo.ml

@@ -137,8 +137,8 @@ let process_package pkg =
           (List.concat_map
              (fun directory ->
                Format.eprintf "Processing directory: %a\n%!" Fpath.pp directory;
-               Packages.Lib.v (top_dir pkg) libname_of_archive pkg.name
-                 directory None)
+               Packages.Lib.v ~pkg_dir:(top_dir pkg) ~libname_of_archive
+                 ~pkg_name:pkg.name ~dir:directory ~cmtidir:None)
              Fpath.(Set.to_list directories)))
       metas
   in
@@ -161,9 +161,10 @@ let process_package pkg =
       (fun libdir ->
         Logs.debug (fun m ->
             m "Processing directory without META: %a" Fpath.pp libdir);
-        Packages.Lib.v (top_dir pkg) Util.StringMap.empty pkg.name
-          Fpath.(pkg_path // libdir)
-          None)
+        Packages.Lib.v ~pkg_dir:(top_dir pkg)
+          ~libname_of_archive:Util.StringMap.empty ~pkg_name:pkg.name
+          ~dir:Fpath.(pkg_path // libdir)
+          ~cmtidir:None)
       libdirs_without_meta
   in
   Printf.eprintf "Found %d metas" (List.length metas);
@@ -187,7 +188,7 @@ let pp ppf v =
 
 let () = ignore pp
 
-let of_voodoo pkg_name blessed =
+let of_voodoo pkg_name ~blessed =
   let contents =
     Bos.OS.Dir.fold_contents ~dotfiles:true
       (fun p acc -> p :: acc)

src/driver/voodoo.mli

@@ -1,4 +1,4 @@
 val find_universe_and_version :
   string -> (string * string, [> `Msg of string ]) result
 
-val of_voodoo : string -> bool -> Packages.set
+val of_voodoo : string -> blessed:bool -> Packages.set