Use Action_builder in Gen_meta (#12771)

As we can see from the callers, this is the the right type that we
expect everywhere and we remove some uses of [Resolve.Memo.read_memo]
which break lazy loading.

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

Author: rgrinberg

src/dune_rules/gen_meta.ml

@@ -1,5 +1,4 @@
 open Import
-open Memo.O
 open Meta
 
 module Pub_name = struct
@@ -61,6 +60,7 @@ let archives ?(preds = []) lib =
 ;;
 
 let gen_lib pub_name lib ~version =
+  let open Action_builder.O in
   let info = Lib.info lib in
   let synopsis = Lib_info.synopsis info in
   let kind = Lib_info.kind info in
@@ -87,10 +87,10 @@ let gen_lib pub_name lib ~version =
     | _ -> name
   in
   let to_names = Lib_name.Set.of_list_map ~f:name in
-  let* lib_deps = Resolve.Memo.read_memo (Lib.requires lib) >>| to_names in
-  let* lib_re_exports = Resolve.Memo.read_memo (Lib.re_exports lib) >>| to_names in
+  let* lib_deps = Resolve.Memo.read (Lib.requires lib) >>| to_names in
+  let* lib_re_exports = Resolve.Memo.read (Lib.re_exports lib) >>| to_names in
   let* ppx_rt_deps =
-    Lib.ppx_runtime_deps lib |> Memo.bind ~f:Resolve.read_memo |> Memo.map ~f:to_names
+    Lib.ppx_runtime_deps lib |> Resolve.Memo.read |> Action_builder.map ~f:to_names
   in
   let+ ppx_runtime_deps_for_deprecated_method =
     (* For the deprecated method, we need to put all the runtime dependencies of
@@ -106,7 +106,7 @@ let gen_lib pub_name lib ~version =
     Lib.closure [ lib ] ~linking:false
     >>= Resolve.Memo.List.concat_map ~f:Lib.ppx_runtime_deps
     >>| to_names
-    |> Resolve.Memo.read_memo
+    |> Resolve.Memo.read
   in
   List.concat
     [ version
@@ -168,14 +168,14 @@ let gen_lib pub_name lib ~version =
 ;;
 
 let gen ~(package : Package.t) ~add_directory_entry entries =
-  let open Memo.O in
+  let open Action_builder.O in
   let version =
     match Package.version package with
     | None -> []
     | Some s -> [ rule "version" [] Set (Package_version.to_string s) ]
   in
   let+ pkgs =
-    Memo.parallel_map entries ~f:(fun (e : Scope.DB.Lib_entry.t) ->
+    Action_builder.List.map entries ~f:(fun (e : Scope.DB.Lib_entry.t) ->
       match e with
       | Library lib ->
         let info = Lib.Local.info lib in
@@ -210,7 +210,7 @@ let gen ~(package : Package.t) ~add_directory_entry entries =
       | Deprecated_library_name
           { old_name = old_public_name, _; new_public_name = _, new_public_name; _ } ->
         let deps = Lib_name.Set.singleton new_public_name in
-        Memo.return
+        Action_builder.return
           ( Pub_name.of_lib_name (Public_lib.name old_public_name)
           , version @ [ requires deps; exports deps ] ))
   in

src/dune_rules/gen_meta.mli

@@ -9,4 +9,4 @@ val gen
   :  package:Package.t
   -> add_directory_entry:bool
   -> Scope.DB.Lib_entry.t list
-  -> Meta.t Memo.t
+  -> Meta.t Action_builder.t

src/dune_rules/install_rules.ml

@@ -893,10 +893,8 @@ end = struct
         (let open Action_builder.O in
          (let+ template = template
           and+ (meta : Meta.t) =
-            let open Memo.O in
-            meta_entries
+            Action_builder.of_memo meta_entries
             >>= Gen_meta.gen ~package:pkg ~add_directory_entry:true
-            |> Action_builder.of_memo
           in
           let pp =
             Pp.concat_map template ~sep:Pp.newline ~f:(fun s ->
@@ -945,7 +943,6 @@ end = struct
                 |> List.map ~f:(fun deprecated ->
                   Scope.DB.Lib_entry.Deprecated_library_name deprecated)
                 |> Gen_meta.gen ~package:pkg ~add_directory_entry:false
-                |> Action_builder.of_memo
               in
               let open Pp.O in
               Pp.vbox (Meta.pp meta.entries ++ Pp.cut)