From b4f1691554465cc014a3f414732beb48a10aea1a Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Fri, 13 Dec 2024 19:27:55 +0000 Subject: [PATCH] fix: regression in 11200 (#11204) Remove all error checking for empty projects in [$ dune subst] Signed-off-by: Rudi Grinberg Signed-off-by: Etienne Marais --- bin/subst.ml | 4 ++++ doc/changes/11204.md | 2 ++ test/blackbox-tests/test-cases/github11200.t | 4 ++++ 3 files changed, 10 insertions(+) create mode 100644 doc/changes/11204.md create mode 100644 test/blackbox-tests/test-cases/github11200.t diff --git a/bin/subst.ml b/bin/subst.ml index c4d61c63f15..9b8ed04bfda 100644 --- a/bin/subst.ml +++ b/bin/subst.ml @@ -332,6 +332,10 @@ let subst vcs = |> Memo.return) in Some (None, None, Path.Source.Set.to_list files)) + >>| Option.bind ~f:(fun ((_, _, files) as s) -> + match files with + | [] -> None + | _ :: _ -> Some s) >>= Memo.Option.iter ~f:(fun (version, commit, files) -> let+ (dune_project : Dune_project.t) = (* CR-soon rgrinberg: unify this check with the above version check *) diff --git a/doc/changes/11204.md b/doc/changes/11204.md new file mode 100644 index 00000000000..8c4fce1771f --- /dev/null +++ b/doc/changes/11204.md @@ -0,0 +1,2 @@ +- Remove useless error message when running `$ dune subst` in empty projects. + (@rgrinberg, #11204, fixes #11200) diff --git a/test/blackbox-tests/test-cases/github11200.t b/test/blackbox-tests/test-cases/github11200.t new file mode 100644 index 00000000000..27944c6daff --- /dev/null +++ b/test/blackbox-tests/test-cases/github11200.t @@ -0,0 +1,4 @@ +Running `dune subst` should succeed in an empty directory. +Regression test for https://github.com/ocaml/dune/issues/11200 + + $ dune subst