diff --git a/src/dune_engine/action.ml b/src/dune_engine/action.ml index e083017ae0f..0d655caa8a8 100644 --- a/src/dune_engine/action.ml +++ b/src/dune_engine/action.ml @@ -287,7 +287,7 @@ type is_useful = | Clearly_not | Maybe -let is_useful_to distribute memoize = +let is_useful_to memoize = let rec loop t = match t with | Chdir (_, t) -> loop t @@ -301,17 +301,17 @@ let is_useful_to distribute memoize = | Copy _ -> memoize | Symlink _ -> false | Hardlink _ -> false - | Write_file _ -> distribute + | Write_file _ -> true | Rename _ -> memoize | Remove_tree _ -> false - | Diff _ -> distribute + | Diff _ -> true | Mkdir _ -> false - | Merge_files_into _ -> distribute + | Merge_files_into _ -> true | Run _ -> true | Dynamic_run _ -> true | System _ -> true | Bash _ -> true - | Extension (module A) -> A.Spec.is_useful_to ~distribute ~memoize + | Extension (module A) -> A.Spec.is_useful_to ~memoize in fun t -> match loop t with @@ -319,8 +319,8 @@ let is_useful_to distribute memoize = | false -> Clearly_not ;; -let is_useful_to_distribute = is_useful_to true false -let is_useful_to_memoize = is_useful_to true true +let is_useful_to_distribute = is_useful_to false +let is_useful_to_memoize = is_useful_to true module Full = struct module T = struct diff --git a/src/dune_engine/action_intf.ml b/src/dune_engine/action_intf.ml index 1fb8908e8d3..7db5971d9bc 100644 --- a/src/dune_engine/action_intf.ml +++ b/src/dune_engine/action_intf.ml @@ -112,7 +112,7 @@ module Ext = struct val name : string val version : int - val is_useful_to : distribute:bool -> memoize:bool -> bool + val is_useful_to : memoize:bool -> bool val encode : ('p, 't) t -> ('p -> Dune_sexp.t) -> ('t -> Dune_sexp.t) -> Dune_sexp.t val bimap : ('a, 'b) t -> ('a -> 'x) -> ('b -> 'y) -> ('x, 'y) t diff --git a/src/dune_patch/dune_patch.ml b/src/dune_patch/dune_patch.ml index df61287689b..1cbd7f27f17 100644 --- a/src/dune_patch/dune_patch.ml +++ b/src/dune_patch/dune_patch.ml @@ -115,7 +115,7 @@ module Spec = struct let name = "patch" let version = 1 let bimap patch f _ = f patch - let is_useful_to ~distribute:_ ~memoize = memoize + let is_useful_to ~memoize = memoize let encode patch input _ : Dune_lang.t = List [ Dune_lang.atom_or_quoted_string name; input patch ] diff --git a/src/dune_rules/copy_line_directive.ml b/src/dune_rules/copy_line_directive.ml index 053b8d06f3e..a6acc865946 100644 --- a/src/dune_rules/copy_line_directive.ml +++ b/src/dune_rules/copy_line_directive.ml @@ -72,7 +72,7 @@ module Spec = struct let name = "copy-line-directive" let version = 1 let bimap (src, dst, merlin) f g = f src, g dst, merlin - let is_useful_to ~distribute:_ ~memoize = memoize + let is_useful_to ~memoize = memoize let encode (src, dst, merlin) path target : Dune_lang.t = List diff --git a/src/dune_rules/cram/cram_exec.ml b/src/dune_rules/cram/cram_exec.ml index 10b1254d420..741035f77af 100644 --- a/src/dune_rules/cram/cram_exec.ml +++ b/src/dune_rules/cram/cram_exec.ml @@ -452,7 +452,7 @@ module Spec = struct let name = "cram" let version = 1 let bimap path f _ = f path - let is_useful_to ~distribute:_ ~memoize:_ = true + let is_useful_to ~memoize:_ = true let encode script path _ : Dune_lang.t = List [ Dune_lang.atom_or_quoted_string "cram"; path script ] diff --git a/src/dune_rules/format_rules.ml b/src/dune_rules/format_rules.ml index a6cb42f6d7b..0f539e82f82 100644 --- a/src/dune_rules/format_rules.ml +++ b/src/dune_rules/format_rules.ml @@ -33,7 +33,7 @@ let action = let name = "format-dune-file" let version = 1 let bimap (ver, src, dst) f g = ver, f src, g dst - let is_useful_to ~distribute:_ ~memoize = memoize + let is_useful_to ~memoize = memoize let encode (version, src, dst) path target : Dune_lang.t = List diff --git a/src/dune_rules/install_rules.ml b/src/dune_rules/install_rules.ml index 91fd9dae51c..f584a2761de 100644 --- a/src/dune_rules/install_rules.ml +++ b/src/dune_rules/install_rules.ml @@ -1078,7 +1078,7 @@ include ( let name = "gen-install-file" let version = 1 let bimap (entries, dst) _ g = entries, g dst - let is_useful_to ~distribute:_ ~memoize = memoize + let is_useful_to ~memoize = memoize let encode (_entries, dst) _path target : Dune_lang.t = List [ Dune_lang.atom_or_quoted_string name; target dst ] diff --git a/src/dune_rules/pkg_rules.ml b/src/dune_rules/pkg_rules.ml index 5de2979e984..b386f31b8e6 100644 --- a/src/dune_rules/pkg_rules.ml +++ b/src/dune_rules/pkg_rules.ml @@ -387,7 +387,7 @@ module Substitute = struct let name = "substitute" let version = 1 let bimap (e, s, i, o) f g = e, s, f i, g o - let is_useful_to ~distribute:_ ~memoize = memoize + let is_useful_to ~memoize = memoize let encode (e, s, i, o) input output : Dune_lang.t = let e = @@ -973,7 +973,7 @@ module Install_action = struct } ;; - let is_useful_to ~distribute:_ ~memoize = memoize + let is_useful_to ~memoize = memoize let encode { install_file; config_file; target_dir; install_action; package } @@ -1225,7 +1225,7 @@ module Fetch = struct let name = "source-fetch" let version = 1 let bimap t _ g = { t with target_dir = g t.target_dir } - let is_useful_to ~distribute:_ ~memoize = memoize + let is_useful_to ~memoize = memoize let encode_loc f (loc, x) = Dune_lang.List @@ -1303,7 +1303,7 @@ module Copy_tree = struct let name = "copy-tree" let version = 1 let bimap (src, dst) f g = f src, g dst - let is_useful_to ~distribute:_ ~memoize = memoize + let is_useful_to ~memoize = memoize let encode (src, dst) dep target : Dune_lang.t = List [ Dune_lang.atom_or_quoted_string name; dep src; target dst ]