refactor: [bin_artifacts] to [artifacts] (#8742)

Signed-off-by: Rudi Grinberg <[email protected]>

Author: rgrinberg

src/dune_rules/env_node.ml

@@ -19,7 +19,7 @@ type t =
   ; foreign_flags : string list Action_builder.t Foreign_language.Dict.t
   ; link_flags : Link_flags.t Memo.Lazy.t
   ; external_env : Env.t Memo.Lazy.t
-  ; bin_artifacts : Artifacts.t Memo.Lazy.t
+  ; artifacts : Artifacts.t Memo.Lazy.t
   ; inline_tests : Dune_env.Stanza.Inline_tests.t Memo.Lazy.t
   ; menhir_flags : string list Action_builder.t Memo.Lazy.t
   ; odoc : Odoc.t Memo.Lazy.t
@@ -35,7 +35,7 @@ let ocaml_flags t = Memo.Lazy.force t.ocaml_flags
 let foreign_flags t = t.foreign_flags
 let link_flags t = Memo.Lazy.force t.link_flags
 let external_env t = Memo.Lazy.force t.external_env
-let bin_artifacts t = Memo.Lazy.force t.bin_artifacts
+let artifacts t = Memo.Lazy.force t.artifacts
 let inline_tests t = Memo.Lazy.force t.inline_tests
 let js_of_ocaml t = Memo.Lazy.force t.js_of_ocaml
 let menhir_flags t = Memo.Lazy.force t.menhir_flags |> Action_builder.of_memo_join
@@ -69,7 +69,7 @@ let make
   ~expander_for_artifacts
   ~default_context_flags
   ~default_env
-  ~default_bin_artifacts
+  ~default_artifacts
   ~default_bin_annot
   =
   let open Memo.O in
@@ -113,8 +113,8 @@ let make
       in
       Memo.return env)
   in
-  let bin_artifacts =
-    inherited ~field:bin_artifacts ~root:default_bin_artifacts (fun binaries ->
+  let artifacts =
+    inherited ~field:artifacts ~root:default_artifacts (fun binaries ->
       let+ local_binaries = Memo.Lazy.force local_binaries in
       Artifacts.add_binaries binaries ~dir local_binaries)
   in
@@ -234,7 +234,7 @@ let make
   ; foreign_flags
   ; link_flags
   ; external_env
-  ; bin_artifacts
+  ; artifacts
   ; local_binaries
   ; inline_tests
   ; js_of_ocaml

src/dune_rules/env_node.mli

@@ -27,7 +27,7 @@ val make
   -> expander_for_artifacts:Expander.t Memo.Lazy.t
   -> default_context_flags:string list Action_builder.t Foreign_language.Dict.t
   -> default_env:Env.t
-  -> default_bin_artifacts:Artifacts.t
+  -> default_artifacts:Artifacts.t
   -> default_bin_annot:bool
   -> t
 
@@ -39,7 +39,7 @@ val js_of_ocaml : t -> string list Action_builder.t Js_of_ocaml.Env.t Memo.t
 val foreign_flags : t -> string list Action_builder.t Foreign_language.Dict.t
 val link_flags : t -> Link_flags.t Memo.t
 val local_binaries : t -> File_binding.Expanded.t list Memo.t
-val bin_artifacts : t -> Artifacts.t Memo.t
+val artifacts : t -> Artifacts.t Memo.t
 val odoc : t -> Odoc.t Memo.t
 val coq : t -> Coq.t Action_builder.t Memo.t
 val menhir_flags : t -> string list Action_builder.t

src/dune_rules/expander.ml

@@ -50,7 +50,7 @@ type t =
   ; local_env : string Action_builder.t Env.Var.Map.t
   ; lib_artifacts : Lib.DB.t
   ; lib_artifacts_host : Lib.DB.t
-  ; bin_artifacts_host : Artifacts.t
+  ; artifacts_host : Artifacts.t
   ; bindings : value Pform.Map.t
   ; scope : Scope.t
   ; scope_host : Scope.t
@@ -63,7 +63,7 @@ type t =
   }
 
 let scope t = t.scope
-let artifacts t = t.bin_artifacts_host
+let artifacts t = t.artifacts_host
 let dir t = t.dir
 let context t = t.context
 let set_foreign_flags t ~f:foreign_flags = { t with foreign_flags }
@@ -74,7 +74,7 @@ let set_local_env_var t ~var ~value =
 
 let set_dir t ~dir = { t with dir }
 let set_scope t ~scope ~scope_host = { t with scope; scope_host }
-let set_bin_artifacts t ~bin_artifacts_host = { t with bin_artifacts_host }
+let set_artifacts t ~artifacts_host = { t with artifacts_host }
 let set_lookup_ml_sources t ~f = { t with lookup_artifacts = Some f }
 let set_expanding_what t x = { t with expanding_what = x }
 
@@ -570,7 +570,7 @@ let expand_pform_macro
              Action_builder.of_memo
                (Artifacts.binary
                   ~loc:(Some (Dune_lang.Template.Pform.loc source))
-                  t.bin_artifacts_host
+                  t.artifacts_host
                   s)
            in
            dep (Action.Prog.ok_exn prog)))
@@ -596,7 +596,7 @@ let expand_pform_macro
       (fun t ->
         Without
           (let open Memo.O in
-           let+ b = Artifacts.binary_available t.bin_artifacts_host s in
+           let+ b = Artifacts.binary_available t.artifacts_host s in
            b |> string_of_bool |> string))
   | Read -> expand_read_macro ~dir ~source s ~read:Io.read_file ~pack:string
   | Read_lines -> expand_read_macro ~dir ~source s ~read:Io.lines_of_file ~pack:strings
@@ -617,7 +617,7 @@ let expand_pform_macro
       (fun t ->
         Without
           (let open Memo.O in
-           let* coqc = Artifacts.binary t.bin_artifacts_host ~loc:None "coqc" in
+           let* coqc = Artifacts.binary t.artifacts_host ~loc:None "coqc" in
            let+ t = Coq_config.make ~coqc in
            match Coq_config.by_name t s with
            | None ->
@@ -725,7 +725,7 @@ let make_root
   ~env
   ~lib_artifacts
   ~lib_artifacts_host
-  ~bin_artifacts_host
+  ~artifacts_host
   =
   { dir = Context.build_dir context
   ; env
@@ -735,7 +735,7 @@ let make_root
   ; scope_host
   ; lib_artifacts
   ; lib_artifacts_host
-  ; bin_artifacts_host
+  ; artifacts_host
   ; c_compiler = Ocaml_config.c_compiler (Context.ocaml context).ocaml_config
   ; context
   ; lookup_artifacts = None

src/dune_rules/expander.mli

@@ -15,7 +15,7 @@ val make_root
   -> env:Env.t
   -> lib_artifacts:Lib.DB.t
   -> lib_artifacts_host:Lib.DB.t
-  -> bin_artifacts_host:Artifacts.t
+  -> artifacts_host:Artifacts.t
   -> t
 
 val set_foreign_flags
@@ -26,7 +26,7 @@ val set_foreign_flags
 val set_local_env_var : t -> var:string -> value:string Action_builder.t -> t
 val set_dir : t -> dir:Path.Build.t -> t
 val set_scope : t -> scope:Scope.t -> scope_host:Scope.t -> t
-val set_bin_artifacts : t -> bin_artifacts_host:Artifacts.t -> t
+val set_artifacts : t -> artifacts_host:Artifacts.t -> t
 
 val set_lookup_ml_sources
   :  t

src/dune_rules/super_context.ml

@@ -29,7 +29,7 @@ let default_context_flags (ctx : Build_context.t) ocaml_config ~project =
 module Env_tree : sig
   type t
 
-  val force_bin_artifacts : t -> unit Memo.t
+  val force_artifacts : t -> unit Memo.t
   val context : t -> Context.t
   val get_node : t -> dir:Path.Build.t -> Env_node.t Memo.t
   val get_context_env : t -> Env.t
@@ -39,11 +39,11 @@ module Env_tree : sig
     -> host_env_tree:t option
     -> default_env:Env_node.t Memo.Lazy.t
     -> root_expander:Expander.t
-    -> bin_artifacts:Artifacts.t
+    -> artifacts:Artifacts.t
     -> context_env:Env.t
     -> t
 
-  val bin_artifacts_host : t -> dir:Path.Build.t -> Artifacts.t Memo.t
+  val artifacts_host : t -> dir:Path.Build.t -> Artifacts.t Memo.t
   val expander : t -> dir:Path.Build.t -> Expander.t Memo.t
 end = struct
   open Memo.O
@@ -54,25 +54,25 @@ end = struct
     ; default_env : Env_node.t Memo.Lazy.t
     ; host : t option
     ; root_expander : Expander.t
-    ; bin_artifacts : Artifacts.t
+    ; artifacts : Artifacts.t
     ; get_node : Path.Build.t -> Env_node.t Memo.t
     }
 
-  let force_bin_artifacts { bin_artifacts; _ } = Artifacts.force bin_artifacts
+  let force_artifacts { artifacts; _ } = Artifacts.force artifacts
   let context t = t.context
   let get_node t ~dir = t.get_node dir
   let get_context_env t = t.context_env
 
-  let bin_artifacts_host t ~dir =
-    let bin_artifacts t ~dir = get_node t ~dir >>= Env_node.bin_artifacts in
+  let artifacts_host t ~dir =
+    let artifacts t ~dir = get_node t ~dir >>= Env_node.artifacts in
     match t.host with
-    | None -> bin_artifacts t ~dir
+    | None -> artifacts t ~dir
     | Some host ->
       let dir =
         Path.Build.drop_build_context_exn dir
         |> Path.Build.append_source (Context.build_dir host.context)
       in
-      bin_artifacts host ~dir
+      artifacts host ~dir
   ;;
 
   let external_env t ~dir = get_node t ~dir >>= Env_node.external_env
@@ -97,14 +97,14 @@ end = struct
   ;;
 
   let extend_expander t ~dir ~expander_for_artifacts =
-    let+ bin_artifacts_host = bin_artifacts_host t ~dir
+    let+ artifacts_host = artifacts_host t ~dir
     and+ bindings =
       let+ inline_tests = get_node t ~dir >>= Env_node.inline_tests in
       let str = Dune_env.Stanza.Inline_tests.to_string inline_tests in
       Pform.Map.singleton (Var Inline_tests) [ Value.String str ]
     in
     Expander.add_bindings ~bindings expander_for_artifacts
-    |> Expander.set_bin_artifacts ~bin_artifacts_host
+    |> Expander.set_artifacts ~artifacts_host
   ;;
 
   let expander t ~dir =
@@ -177,7 +177,7 @@ end = struct
       ~expander_for_artifacts
       ~default_context_flags
       ~default_env:t.context_env
-      ~default_bin_artifacts:t.bin_artifacts
+      ~default_artifacts:t.artifacts
       ~default_bin_annot:true
   ;;
 
@@ -192,14 +192,7 @@ end = struct
      binding. To work around this limitation, we place the functions into a
      recursive module [Rec]. Since recursive let-modules are not allowed either,
      we need to also wrap [Rec] inside a non-recursive module [Non_rec]. *)
-  let create
-    ~context
-    ~host_env_tree
-    ~default_env
-    ~root_expander
-    ~bin_artifacts
-    ~context_env
-    =
+  let create ~context ~host_env_tree ~default_env ~root_expander ~artifacts ~context_env =
     let module Non_rec = struct
       module rec Rec : sig
         val env_tree : unit -> t
@@ -211,7 +204,7 @@ end = struct
           ; default_env
           ; host = host_env_tree
           ; root_expander
-          ; bin_artifacts
+          ; artifacts
           ; get_node = Rec.memo
           }
         ;;
@@ -330,8 +323,8 @@ let dump_env t ~dir =
 ;;
 
 let resolve_program t ~dir ?hint ~loc bin =
-  let* bin_artifacts = Env_tree.bin_artifacts_host t ~dir in
-  Artifacts.binary ?hint ~loc bin_artifacts bin
+  let* artifacts = Env_tree.artifacts_host t ~dir in
+  Artifacts.binary ?hint ~loc artifacts bin
 ;;
 
 let add_packages_env context ~base stanzas packages =
@@ -437,7 +430,7 @@ let make_default_env_node
       ~expander_for_artifacts
       ~default_context_flags
       ~default_env:root_env
-      ~default_bin_artifacts:artifacts
+      ~default_artifacts:artifacts
       ~default_bin_annot:true
   in
   make
@@ -510,7 +503,7 @@ let create ~(context : Context.t) ~(host : t option) ~packages ~stanzas =
       ~context
       ~env:expander_env
       ~lib_artifacts:public_libs
-      ~bin_artifacts_host:artifacts_host
+      ~artifacts_host
       ~lib_artifacts_host:public_libs_host
   and+ artifacts = artifacts
   and+ root_env =
@@ -535,7 +528,7 @@ let create ~(context : Context.t) ~(host : t option) ~packages ~stanzas =
     ~default_env
     ~host_env_tree:host
     ~root_expander
-    ~bin_artifacts:artifacts
+    ~artifacts
     ~context_env:root_env
 ;;
 
@@ -580,7 +573,7 @@ let find name =
 
 let all_init_deferred () =
   let* all = Memo.Lazy.force all in
-  Context_name.Map.values all |> Memo.parallel_iter ~f:Env_tree.force_bin_artifacts
+  Context_name.Map.values all |> Memo.parallel_iter ~f:Env_tree.force_artifacts
 ;;
 
 module As_memo_key = struct