Revert "Fix difference between bootstrap & dune behaviour w.r.t include-subdirs ambiguity"

Author: Alizter

src/dune_rules/modules.ml

@@ -410,9 +410,7 @@ module Group = struct
     fun acc modules m -> loop acc modules (Module.path m)
   ;;
 
-  (* [parents acc modules m] returns [acc] followed by all parent groups of 
-     module [m], ordered from innermost to outermost parent. *)
-  let parents (t : t) m = parents_modules [ t ] t.modules m |> List.rev
+  let parents (t : t) m = parents_modules [ t ] t.modules m
 
   module Memo_traversals = struct
     let rec parallel_map ({ alias; modules; name = _ } as t) ~f =
@@ -487,10 +485,7 @@ module Group = struct
       Ok (if Module_name.equal name (Module.name li) then [ li ] else [])
     | _ ->
       (* TODO don't recompute this *)
-      let parents =
-        parents_modules [ t ] t.modules of_
-        |> List.map ~f:(fun g -> g.modules, Some g.name)
-      in
+      let parents = parents t of_ |> List.map ~f:(fun g -> g.modules, Some g.name) in
       Find_dep.find_dep_of_parents parents name
   ;;
 

test/blackbox-tests/test-cases/boot/include-subdirs-qualified-ambiguous.t

@@ -97,7 +97,7 @@
    (S $TESTCASE_ROOT/groupintf)
    (S $TESTCASE_ROOT/utils)
    (FLG (-w @1..3@5[email protected]@[email protected]@[email protected]@67@69-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
-   (FLG (-open Foo -open Foo__Groupintf__))
+   (FLG (-open Foo__Groupintf__ -open Foo))
    (UNIT_NAME foo__Groupintf__Calc))
   Calc: _build/default/groupintf/calc.ml
   ((INDEX $TESTCASE_ROOT/_build/default/.foo.objs/cctx.ocaml-index)
@@ -109,7 +109,7 @@
    (S $TESTCASE_ROOT/groupintf)
    (S $TESTCASE_ROOT/utils)
    (FLG (-w @1..3@5[email protected]@[email protected]@[email protected]@67@69-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
-   (FLG (-open Foo -open Foo__Groupintf__))
+   (FLG (-open Foo__Groupintf__ -open Foo))
    (UNIT_NAME foo__Groupintf__Calc))
   Groupintf: _build/default/groupintf/groupintf
   ((INDEX $TESTCASE_ROOT/_build/default/.foo.objs/cctx.ocaml-index)
@@ -121,7 +121,7 @@
    (S $TESTCASE_ROOT/groupintf)
    (S $TESTCASE_ROOT/utils)
    (FLG (-w @1..3@5[email protected]@[email protected]@[email protected]@67@69-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
-   (FLG (-open Foo -open Foo__Groupintf__))
+   (FLG (-open Foo__Groupintf__ -open Foo))
    (UNIT_NAME foo__Groupintf))
   Groupintf: _build/default/groupintf/groupintf.ml
   ((INDEX $TESTCASE_ROOT/_build/default/.foo.objs/cctx.ocaml-index)
@@ -133,7 +133,7 @@
    (S $TESTCASE_ROOT/groupintf)
    (S $TESTCASE_ROOT/utils)
    (FLG (-w @1..3@5[email protected]@[email protected]@[email protected]@67@69-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
-   (FLG (-open Foo -open Foo__Groupintf__))
+   (FLG (-open Foo__Groupintf__ -open Foo))
    (UNIT_NAME foo__Groupintf))
   Main: _build/default/main
   ((INDEX $TESTCASE_ROOT/_build/default/.foo.objs/cctx.ocaml-index)
@@ -169,7 +169,7 @@
    (S $TESTCASE_ROOT/groupintf)
    (S $TESTCASE_ROOT/utils)
    (FLG (-w @1..3@5[email protected]@[email protected]@[email protected]@67@69-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
-   (FLG (-open Foo -open Foo__Utils))
+   (FLG (-open Foo__Utils -open Foo))
    (UNIT_NAME foo__Utils__Calc))
   Calc: _build/default/utils/calc.ml
   ((INDEX $TESTCASE_ROOT/_build/default/.foo.objs/cctx.ocaml-index)
@@ -181,6 +181,6 @@
    (S $TESTCASE_ROOT/groupintf)
    (S $TESTCASE_ROOT/utils)
    (FLG (-w @1..3@5[email protected]@[email protected]@[email protected]@67@69-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
-   (FLG (-open Foo -open Foo__Utils))
+   (FLG (-open Foo__Utils -open Foo))
    (UNIT_NAME foo__Utils__Calc))
   $ dune ocaml merlin dump-config utils