neat - code cleanup

Signed-off-by: Haochen Kotoi-Xie <hx@kxc.inc>
ocaml · Jun 9, 2023 · b14c82b · b14c82b
1 parent f5823c7
commit b14c82b
Showing 1 changed file with 10 additions and 14 deletions.
diff --git a/src/dune_rules/melange/melange_rules.ml b/src/dune_rules/melange/melange_rules.ml
@@ -172,6 +172,14 @@ let build_js ~loc ~dir ~pkg_name ~mode ~module_systems ~output ~obj_dir ~sctx
            ; Dep src
            ]))
 
+let add_deps_to_default_ailases ~dir deps =
+  let open Memo.O in
+  let melange_implicit_alias = Alias.make Melange_stanzas.Emit.implicit_alias ~dir in
+  let dune_default_alias = Alias.make Alias.Name.all ~dir in
+  let attach alias = Rules.Produce.Alias.add_deps alias deps in
+  attach melange_implicit_alias
+  >>> attach dune_default_alias
+
 let setup_emit_cmj_rules ~sctx ~dir ~scope ~expander ~dir_contents
     (mel : Melange_stanzas.Emit.t) =
   let open Memo.O in
@@ -237,11 +245,7 @@ let setup_emit_cmj_rules ~sctx ~dir ~scope ~expander ~dir_contents
       in
       match mel.alias with
       | None ->
-        let alias = Alias.make Melange_stanzas.Emit.implicit_alias ~dir in
-        let default_alias = Alias.make Alias.Name.all ~dir in
-        let+ () = Rules.Produce.Alias.add_deps default_alias emit_and_libs_deps
-        and+ () = Rules.Produce.Alias.add_deps alias emit_and_libs_deps in
-        ()
+        add_deps_to_default_ailases ~dir emit_and_libs_deps
       | Some alias_name ->
         let alias = Alias.make alias_name ~dir in
         Rules.Produce.Alias.add_deps alias emit_and_libs_deps
@@ -329,15 +333,7 @@ let setup_runtime_assets_rules sctx ~dir ~target_dir ~mode ~output ~for_ mel =
   and+ () =
     match mel.alias with
     | None ->
-      let alias =
-        Alias.make Melange_stanzas.Emit.implicit_alias ~dir:target_dir
-      in
-      let default_alias =
-        Alias.make Alias.Name.all ~dir:target_dir
-      in
-      let+ () = Rules.Produce.Alias.add_deps alias deps
-      and+ () = Rules.Produce.Alias.add_deps default_alias deps in
-      ()
+      add_deps_to_default_ailases ~dir:target_dir deps
     | Some alias_name ->
       let alias = Alias.make alias_name ~dir:target_dir in
       Rules.Produce.Alias.add_deps alias deps