ocaml · Leonidas-from-XIV · Mar 5, 2024 · Feb 9, 2024 · Feb 9, 2024
diff --git a/doc/changes/9955.md b/doc/changes/9955.md
@@ -0,0 +1,2 @@
+- Fix a problem with the doc-new target where transitive dependencies were missed during
+  compile. This leads to missing expansions in the output docs. (#9955, @jonludlam)
diff --git a/src/dune_rules/odoc_new.ml b/src/dune_rules/odoc_new.ml
@@ -907,7 +907,7 @@ let compile_module
    require all of the odoc files for all dependency libraries to be
    created rather than doing any fine-grained dependency management. *)
 let compile_requires stdlib_opt libs =
-  Memo.List.map ~f:Lib.requires libs
+  Memo.List.map ~f:(fun l -> Lib.closure ~linking:false [ l ]) libs
   >>| Resolve.all
   >>| Resolve.map ~f:(fun requires ->
     let requires = List.flatten requires in

diff --git a/test/blackbox-tests/test-cases/odoc/new/transitive-compile-deps.t/c.ml b/test/blackbox-tests/test-cases/odoc/new/transitive-compile-deps.t/c.ml
@@ -0,0 +1 @@
+module type S = module type of B.A
diff --git a/test/blackbox-tests/test-cases/odoc/new/transitive-compile-deps.t/dune b/test/blackbox-tests/test-cases/odoc/new/transitive-compile-deps.t/dune
@@ -0,0 +1,4 @@
+(library
+ (public_name odoctest3)
+ (libraries odoctest3.sublib2))
+
diff --git a/test/blackbox-tests/test-cases/odoc/new/transitive-compile-deps.t/dune-project b/test/blackbox-tests/test-cases/odoc/new/transitive-compile-deps.t/dune-project
@@ -0,0 +1 @@
+(lang dune 3.0)
diff --git a/test/blackbox-tests/test-cases/odoc/new/transitive-compile-deps.t/odoctest3.opam b/test/blackbox-tests/test-cases/odoc/new/transitive-compile-deps.t/odoctest3.opam
diff --git a/test/blackbox-tests/test-cases/odoc/new/transitive-compile-deps.t/run.t b/test/blackbox-tests/test-cases/odoc/new/transitive-compile-deps.t/run.t
@@ -0,0 +1,9 @@
+This test checks that compilation dependencies are correct
+
+  $ dune build @doc-new
+
+There should be an expansion of S:
+
+  $ ls _build/default/_doc_new/html/docs/local/odoctest3/Odoctest3/C/
+  index.html
+  module-type-S
diff --git a/test/blackbox-tests/test-cases/odoc/new/transitive-compile-deps.t/sublib1/a.ml b/test/blackbox-tests/test-cases/odoc/new/transitive-compile-deps.t/sublib1/a.ml
@@ -0,0 +1 @@
+type t = int
diff --git a/test/blackbox-tests/test-cases/odoc/new/transitive-compile-deps.t/sublib1/dune b/test/blackbox-tests/test-cases/odoc/new/transitive-compile-deps.t/sublib1/dune
@@ -0,0 +1,4 @@
+(library
+ (name sublib1)
+ (wrapped false)
+ (public_name odoctest3.sublib1))
diff --git a/test/blackbox-tests/test-cases/odoc/new/transitive-compile-deps.t/sublib2/b.ml b/test/blackbox-tests/test-cases/odoc/new/transitive-compile-deps.t/sublib2/b.ml
@@ -0,0 +1,2 @@
+module A = A
+
diff --git a/test/blackbox-tests/test-cases/odoc/new/transitive-compile-deps.t/sublib2/dune b/test/blackbox-tests/test-cases/odoc/new/transitive-compile-deps.t/sublib2/dune
@@ -0,0 +1,6 @@
+(library
+ (name sublib2)
+ (wrapped false)
+ (public_name odoctest3.sublib2)
+ (libraries sublib1))
+
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- Fix a problem with the doc-new target where transitive dependencies were missed during
		compile. This leads to missing expansions in the output docs. (#9955, @jonludlam)