diff --git a/CHANGES.md b/CHANGES.md index c47c6c4a..c7c977cf 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -21,6 +21,8 @@ next - `-j` now defaults to the number of processing units available rather 4 (#726, @diml) +- Fix attaching index.mld to documentation (#731, fixes #717 @rgrinberg) + 1.0+beta20 (10/04/2018) ----------------------- diff --git a/src/odoc.ml b/src/odoc.ml index dccc23d9..50d61f4a 100644 --- a/src/odoc.ml +++ b/src/odoc.ml @@ -433,7 +433,8 @@ module Gen (S : sig val sctx : SC.t end) = struct let check_mlds_no_dupes ~pkg ~mlds = match - List.map mlds ~f:(fun mld -> (Path.basename mld, mld)) + List.map mlds ~f:(fun mld -> + (Filename.chop_extension (Path.basename mld), mld)) |> String.Map.of_list with | Ok m -> m diff --git a/test/blackbox-tests/test-cases/github717-odoc-index/run.t b/test/blackbox-tests/test-cases/github717-odoc-index/run.t index 409e870e..bc867e11 100644 --- a/test/blackbox-tests/test-cases/github717-odoc-index/run.t +++ b/test/blackbox-tests/test-cases/github717-odoc-index/run.t @@ -1,5 +1 @@ $ jbuilder build @doc - Multiple rules generated for _build/default/_doc/_odoc/pkg/hello_world/page-index.odoc: - - - - - [1]