From b8c815a84bd729a172bac84bb4a5bba998e34a3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Ch=C3=A1varri?= <javier.chavarri@gmail.com>
Date: Wed, 28 Feb 2024 10:23:59 +0000
Subject: [PATCH] refactor: move odoc priv rules to lib_rules
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Javier Chávarri <javier.chavarri@gmail.com>
---
 src/dune_rules/gen_rules.ml |  5 +----
 src/dune_rules/lib_rules.ml | 11 ++++++++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/dune_rules/gen_rules.ml b/src/dune_rules/gen_rules.ml
index a72714db9e8..c64f696d711 100644
--- a/src/dune_rules/gen_rules.ml
+++ b/src/dune_rules/gen_rules.ml
@@ -114,10 +114,7 @@ end = struct
       let* enabled_if = Lib.DB.available (Scope.libs scope) (Library.best_name lib) in
       if_available_buildable
         ~loc:lib.buildable.loc
-        (fun () ->
-          let+ () = Odoc.setup_private_library_doc_alias sctx ~scope ~dir:ctx_dir lib
-          and+ rules = Lib_rules.rules lib ~sctx ~dir ~scope ~dir_contents ~expander in
-          rules)
+        (fun () -> Lib_rules.rules lib ~sctx ~dir ~scope ~dir_contents ~expander)
         enabled_if
     | Foreign.Library.T lib ->
       Expander.eval_blang expander lib.enabled_if
diff --git a/src/dune_rules/lib_rules.ml b/src/dune_rules/lib_rules.ml
index 17bb062ba87..048bd582976 100644
--- a/src/dune_rules/lib_rules.ml
+++ b/src/dune_rules/lib_rules.ml
@@ -556,6 +556,7 @@ let library_rules
   ~source_modules
   ~dir_contents
   ~compile_info
+  ~ctx_dir
   =
   let source_modules =
     Modules.fold_user_written source_modules ~init:[] ~f:(fun m acc -> m :: acc)
@@ -607,6 +608,7 @@ let library_rules
           ~requires:requires_compile
           ~dir_contents
           ~vlib_stubs_o_files)
+  and+ () = Odoc.setup_private_library_doc_alias sctx ~scope ~dir:ctx_dir lib
   and+ () = Odoc.setup_library_odoc_rules cctx local_lib
   and+ () =
     Sub_system.gen_rules
@@ -648,7 +650,14 @@ let rules (lib : Library.t) ~sctx ~dir_contents ~dir ~expander ~scope =
       | Some _ ->
         Ctypes_rules.gen_rules ~loc:(fst lib.name) ~cctx ~buildable ~sctx ~scope ~dir
     in
-    library_rules lib ~local_lib ~cctx ~source_modules ~dir_contents ~compile_info
+    library_rules
+      lib
+      ~local_lib
+      ~cctx
+      ~source_modules
+      ~dir_contents
+      ~compile_info
+      ~ctx_dir:dir
   in
   let* () = Buildable_rules.gen_select_rules sctx compile_info ~dir in
   Buildable_rules.with_lib_deps (Super_context.context sctx) compile_info ~dir ~f