Use more generic map function instead of map_string_with_vars

Signed-off-by: Marek Kubica <[email protected]>

Author: Leonidas-from-XIV

src/dune_lang/action.mli

@@ -124,8 +124,12 @@ val encode : t Encoder.t
 val decode_dune_file : t Decoder.t
 val decode_pkg : t Decoder.t
 
-(** Transform the string in the action *)
-val map_string_with_vars : t -> f:(String_with_vars.t -> String_with_vars.t) -> t
+val map
+  :  t
+  -> string_with_vars:(String_with_vars.t -> String_with_vars.t)
+  -> slang:(Slang.t -> Slang.t)
+  -> blang:(Slang.Blang.t -> Slang.Blang.t)
+  -> t
 
 (** Raises User_error on invalid action. *)
 val validate : loc:Loc.t -> t -> unit

src/dune_rules/pkg_rules.ml

@@ -1170,9 +1170,13 @@ end = struct
   end
 
   let relocate action =
-    Dune_lang.Action.map_string_with_vars action ~f:(fun sw ->
+    let string_with_vars sw =
       let loc = sw |> String_with_vars.loc |> Dune_pkg.Lock_dir.loc_in_source_tree in
-      String_with_vars.with_loc sw ~loc)
+      String_with_vars.with_loc sw ~loc
+    in
+    let slang = Slang.map_loc ~f:Dune_pkg.Lock_dir.loc_in_source_tree in
+    let blang = Slang.Blang.map_loc ~f:Dune_pkg.Lock_dir.loc_in_source_tree in
+    Dune_lang.Action.map action ~string_with_vars ~slang ~blang
   ;;
 
   let relocate_build b =