testing unwrapped libs with instantiated deps

Signed-off-by: ArthurW <arthur@tarides.com>

Author: art-w

src/dune_rules/ml_sources.ml

@@ -403,7 +403,6 @@ let make_lib_modules
       kind, main_module_name, wrapped
   in
   let has_instances = has_instances lib.buildable in
-  let wrapped = if has_instances then Wrapped.Simple true else wrapped in
   let open Memo.O in
   let* sources, modules =
     let { Buildable.loc = stanza_loc; modules = modules_settings; _ } = lib.buildable in

src/dune_rules/root_module.ml

@@ -16,5 +16,5 @@ let entries sctx ~requires_compile =
     Action_builder.List.map requires ~f:(fun lib ->
       Action_builder.of_memo (entry_module_names sctx lib) >>= Resolve.read)
   in
-  Action_builder.return (List.concat l)
+  Action_builder.return (List.concat l |> List.sort_uniq ~compare:Module_name.compare)
 ;;

test/blackbox-tests/test-cases/oxcaml/unwrapped-with-instantiate.t

@@ -135,3 +135,29 @@ Testing that it also works with another layer of library:
   $ dune exec ./bin/bin.exe
   lib:helper:IMPL
   lib2:lib:helper:IMPL helper:IMPL
+
+TODO: An unwrapped library currently has to instantiate the functors manually,
+because we don't have a file where to put the instantiations:
+
+  $ mkdir unwrap_lib
+  $ cat > unwrap_lib/unwrap_a.ml <<EOF
+  > module Lib = Lib(Param)(Impl) [@jane.non_erasable.instances]
+  > let a () = "a:" ^ Lib.v ()
+  > EOF
+  $ echo 'let b () = "b:" ^ Unwrap_a.a ()' > unwrap_lib/unwrap_b.ml
+  $ cat > unwrap_lib/dune <<EOF
+  > (library
+  >   (name unwrap_lib)
+  >   (wrapped false)
+  >   (flags "-w" "-53") ; ignore misplaced-attribute warning
+  >   (libraries (lib impl)))
+  > EOF
+
+  $ echo 'let () = print_endline (Unwrap_a.a () ^ "," ^ Unwrap_b.b ())' > bin/bin.ml
+  $ cat > bin/dune <<EOF
+  > (executable (name bin) (libraries unwrap_lib))
+  > EOF
+
+  $ dune exec ./bin/bin.exe
+  a:lib:helper:IMPL,b:a:lib:helper:IMPL
+