Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 21, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions src/dune_rules/modules.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down Expand Up @@ -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
;;

Expand Down
34 changes: 0 additions & 34 deletions test/blackbox-tests/test-cases/boot/include-subdirs-qualified-ambiguous.t
View file
Open in desktop

This file was deleted.

31 changes: 0 additions & 31 deletions test/blackbox-tests/test-cases/include-qualified/ambiguous-module-name.t
View file
Open in desktop

This file was deleted.

12 changes: 6 additions & 6 deletions test/blackbox-tests/test-cases/merlin/include-subdirs-qualified.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
(S $TESTCASE_ROOT/groupintf)
(S $TESTCASE_ROOT/utils)
(FLG (-w @[email protected]@30..39@[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)
Expand All @@ -109,7 +109,7 @@
(S $TESTCASE_ROOT/groupintf)
(S $TESTCASE_ROOT/utils)
(FLG (-w @[email protected]@30..39@[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)
Expand All @@ -121,7 +121,7 @@
(S $TESTCASE_ROOT/groupintf)
(S $TESTCASE_ROOT/utils)
(FLG (-w @[email protected]@30..39@[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)
Expand All @@ -133,7 +133,7 @@
(S $TESTCASE_ROOT/groupintf)
(S $TESTCASE_ROOT/utils)
(FLG (-w @[email protected]@30..39@[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)
Expand Down Expand Up @@ -169,7 +169,7 @@
(S $TESTCASE_ROOT/groupintf)
(S $TESTCASE_ROOT/utils)
(FLG (-w @[email protected]@30..39@[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)
Expand All @@ -181,6 +181,6 @@
(S $TESTCASE_ROOT/groupintf)
(S $TESTCASE_ROOT/utils)
(FLG (-w @[email protected]@30..39@[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
Loading