diff --git a/src/dune_engine/artifact_substitution.ml b/src/dune_engine/artifact_substitution.ml index 70ca14d9facb..6c1a933041be 100644 --- a/src/dune_engine/artifact_substitution.ml +++ b/src/dune_engine/artifact_substitution.ml @@ -46,7 +46,7 @@ type hardcoded_ocaml_path = type conf = { get_vcs : Path.Source.t -> Vcs.t option ; get_location : Section.t -> Package.Name.t -> Path.t - ; get_configPath : configpath -> Path.t option + ; get_config_path : configpath -> Path.t option ; hardcoded_ocaml_path : hardcoded_ocaml_path } @@ -56,12 +56,12 @@ let conf_of_context (context : Build_context.t option) = | None -> { get_vcs ; get_location = (fun _ _ -> Code_error.raise "no context available" []) - ; get_configPath = (fun _ -> Code_error.raise "no context available" []) + ; get_config_path = (fun _ -> Code_error.raise "no context available" []) ; hardcoded_ocaml_path = Hardcoded [] } | Some context -> let get_location = Install.Section.Paths.get_local_location context.name in - let get_configPath = function + let get_config_path = function | Sourceroot -> Some (Path.source Path.Source.root) | Stdlib -> Some context.stdlib_dir in @@ -72,7 +72,7 @@ let conf_of_context (context : Build_context.t option) = in { get_vcs = File_tree.nearest_vcs ; get_location - ; get_configPath + ; get_config_path ; hardcoded_ocaml_path } @@ -91,16 +91,16 @@ let conf_for_install ~relocatable ~default_ocamlpath ~stdlib_dir ~prefix ~libdir in Install.Section.Paths.get paths section in - let get_configPath = function + let get_config_path = function | Sourceroot -> None | Stdlib -> Some stdlib_dir in - { get_location; get_vcs; get_configPath; hardcoded_ocaml_path } + { get_location; get_vcs; get_config_path; hardcoded_ocaml_path } let conf_dummy = { get_vcs = (fun _ -> None) ; get_location = (fun _ _ -> Path.root) - ; get_configPath = (fun _ -> None) + ; get_config_path = (fun _ -> None) ; hardcoded_ocaml_path = Hardcoded [] } @@ -140,7 +140,7 @@ let eval t ~conf = Fiber.return (Option.value ~default:"" (let open Option.O in - let+ dir = conf.get_configPath d in + let+ dir = conf.get_config_path d in relocatable dir)) | Hardcoded_ocaml_path -> Fiber.return diff --git a/src/dune_engine/artifact_substitution.mli b/src/dune_engine/artifact_substitution.mli index 8c5eddfb2078..8ad96a216096 100644 --- a/src/dune_engine/artifact_substitution.mli +++ b/src/dune_engine/artifact_substitution.mli @@ -23,7 +23,7 @@ type hardcoded_ocaml_path = type conf = private { get_vcs : Path.Source.t -> Vcs.t option ; get_location : Section.t -> Package.Name.t -> Path.t - ; get_configPath : configpath -> Path.t option + ; get_config_path : configpath -> Path.t option ; hardcoded_ocaml_path : hardcoded_ocaml_path (** Initial prefix of installation when relocatable chosen *) }