From 5c34da9b74305ebbc0cd9bc9e79e42017688bd1e Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Fri, 28 Aug 2026 23:06:31 +0100 Subject: [PATCH] refactor: rename dune_targets to targets The target representation is consumed as Targets throughout the engine, cache, rules, and CLI, but each component currently aliases Dune_targets. Name the library and its main module Targets directly. Remove the aliases and update the bootstrap module roots and library dependencies to match. Signed-off-by: Rudi Grinberg --- bin/dune | 2 +- bin/import.ml | 2 -- boot/libs.ml | 8 ++++---- src/dune_cache/dune | 10 +--------- src/dune_cache/import.ml | 1 - src/dune_engine/dune | 2 +- src/dune_engine/import.ml | 1 - src/dune_rules/dune | 2 +- src/dune_rules/import.ml | 2 -- src/{dune_targets => targets}/dune | 2 +- src/{dune_targets => targets}/import.ml | 0 .../dune_targets.ml => targets/targets.ml} | 0 .../dune_targets.mli => targets/targets.mli} | 0 13 files changed, 9 insertions(+), 23 deletions(-) rename src/{dune_targets => targets}/dune (73%) rename src/{dune_targets => targets}/import.ml (100%) rename src/{dune_targets/dune_targets.ml => targets/targets.ml} (100%) rename src/{dune_targets/dune_targets.mli => targets/targets.mli} (100%) diff --git a/bin/dune b/bin/dune index 4b6885b8b01..2edf9a3d432 100644 --- a/bin/dune +++ b/bin/dune @@ -25,7 +25,7 @@ dune_vcs dune_engine dune_scheduler - dune_targets + targets dune_util dune_upgrader dune_pkg diff --git a/bin/import.ml b/bin/import.ml index e579a6a9789..7e43cbe2826 100644 --- a/bin/import.ml +++ b/bin/import.ml @@ -7,8 +7,6 @@ include struct module Scheduler = Scheduler end -module Targets = Dune_targets - include struct open Dune_engine module Build_config = Build_config diff --git a/boot/libs.ml b/boot/libs.ml index 064b708a836..2f4ed495a12 100644 --- a/boot/libs.ml +++ b/boot/libs.ml @@ -196,8 +196,8 @@ let local_libraries = ; special_builtin_support = None ; root_module = None } - ; { path = "src/dune_targets" - ; main_module_name = Some "Dune_targets" + ; { path = "src/targets" + ; main_module_name = Some "Targets" ; include_subdirs = No ; special_builtin_support = None ; root_module = None @@ -243,7 +243,6 @@ let local_libraries = ; "Dune_glob" ; "Dune_rpc" ; "Dune_scheduler" - ; "Dune_targets" ; "Dune_trace" ; "Dune_util" ; "Dyn" @@ -253,6 +252,7 @@ let local_libraries = ; "Predicate_lang" ; "Rpc" ; "Stdune" + ; "Targets" ; "Thread" ; "Unix" ; "UnixLabels" @@ -460,7 +460,6 @@ let main = ; "Dune_rpc_impl" ; "Dune_rules" ; "Dune_scheduler" - ; "Dune_targets" ; "Dune_trace" ; "Dune_upgrader" ; "Dune_util" @@ -491,6 +490,7 @@ let main = ; "Rpc" ; "Source" ; "Stdune" + ; "Targets" ; "Unix" ; "UnixLabels" ; "Xdg" diff --git a/src/dune_cache/dune b/src/dune_cache/dune index 4e16b4be349..e1ba1daef44 100644 --- a/src/dune_cache/dune +++ b/src/dune_cache/dune @@ -1,12 +1,4 @@ (library (name dune_cache) (synopsis "[Internal] Dune's local and cloud build cache") - (libraries - csexp - dune_digest - dune_util - dune_targets - dune_trace - fiber - stdune - unix)) + (libraries csexp dune_digest dune_util targets dune_trace fiber stdune unix)) diff --git a/src/dune_cache/import.ml b/src/dune_cache/import.ml index afdd2788fae..13c2863e81a 100644 --- a/src/dune_cache/import.ml +++ b/src/dune_cache/import.ml @@ -1,3 +1,2 @@ module Digest = Dune_digest -module Targets = Dune_targets include Stdune diff --git a/src/dune_engine/dune b/src/dune_engine/dune index 532c7aa45d4..4b758da3488 100644 --- a/src/dune_engine/dune +++ b/src/dune_engine/dune @@ -16,7 +16,7 @@ dune_cache dune_scheduler dune_glob - dune_targets + targets dune_trace dune_action_plugin dune_util diff --git a/src/dune_engine/import.ml b/src/dune_engine/import.ml index bf2324b081b..c77c45b8bf9 100644 --- a/src/dune_engine/import.ml +++ b/src/dune_engine/import.ml @@ -10,7 +10,6 @@ module type Stringlike = Dune_util.Stringlike module Persistent = Dune_util.Persistent module Glob = Dune_glob.V1 -module Targets = Dune_targets include No_io (* To make bug reports usable *) diff --git a/src/dune_rules/dune b/src/dune_rules/dune index 815812d69a0..81d0a213a0b 100644 --- a/src/dune_rules/dune +++ b/src/dune_rules/dune @@ -19,7 +19,7 @@ dune_rpc dune_section dune_site_private - dune_targets + targets dune_trace dune_util dune_vcs diff --git a/src/dune_rules/import.ml b/src/dune_rules/import.ml index e745789a492..6efe11d3b50 100644 --- a/src/dune_rules/import.ml +++ b/src/dune_rules/import.ml @@ -33,8 +33,6 @@ include struct module type Stringlike = Stringlike end -module Targets = Dune_targets - include struct open Dune_engine module Corrections = Corrections diff --git a/src/dune_targets/dune b/src/targets/dune similarity index 73% rename from src/dune_targets/dune rename to src/targets/dune index fc4fbe0d74e..c08dd20894e 100644 --- a/src/dune_targets/dune +++ b/src/targets/dune @@ -1,3 +1,3 @@ (library - (name dune_targets) + (name targets) (libraries stdune fiber dyn dune_digest unix)) diff --git a/src/dune_targets/import.ml b/src/targets/import.ml similarity index 100% rename from src/dune_targets/import.ml rename to src/targets/import.ml diff --git a/src/dune_targets/dune_targets.ml b/src/targets/targets.ml similarity index 100% rename from src/dune_targets/dune_targets.ml rename to src/targets/targets.ml diff --git a/src/dune_targets/dune_targets.mli b/src/targets/targets.mli similarity index 100% rename from src/dune_targets/dune_targets.mli rename to src/targets/targets.mli