From 42a390c0edc4578b1051a1293a93019773c9793d Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Tue, 28 Feb 2023 14:25:01 -0600 Subject: [PATCH] _ Signed-off-by: Rudi Grinberg --- src/dune_rules/melange/melange_binary.ml | 9 +++------ src/dune_rules/melange/melange_binary.mli | 2 +- src/dune_rules/merlin/merlin.ml | 6 ++---- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/dune_rules/melange/melange_binary.ml b/src/dune_rules/melange/melange_binary.ml index f7816c5d9fa9..a56a6e780488 100644 --- a/src/dune_rules/melange/melange_binary.ml +++ b/src/dune_rules/melange/melange_binary.ml @@ -32,9 +32,6 @@ let where = let+ res = Memo.exec memo melc in Some res) in - Option.map - ~f:(fun dirs -> - String.split ~on:Bin.path_sep dirs - |> List.map ~f:Path.External.of_string) - melange_dirs - |> Option.value ~default:[] + match melange_dirs with + | None -> [] + | Some dirs -> Bin.parse_path dirs diff --git a/src/dune_rules/melange/melange_binary.mli b/src/dune_rules/melange/melange_binary.mli index 580b7cef29bf..e1691db5a75a 100644 --- a/src/dune_rules/melange/melange_binary.mli +++ b/src/dune_rules/melange/melange_binary.mli @@ -10,4 +10,4 @@ val where : Super_context.t -> loc:Loc.t option -> dir:Path.Build.t - -> Path.External.t list Memo.t + -> Path.t list Memo.t diff --git a/src/dune_rules/merlin/merlin.ml b/src/dune_rules/merlin/merlin.ml index c8f1ce842c41..bc2b75195baf 100644 --- a/src/dune_rules/merlin/merlin.ml +++ b/src/dune_rules/merlin/merlin.ml @@ -476,10 +476,8 @@ module Unprocessed = struct let+ dirs = Melange_binary.where sctx ~loc:None ~dir in match dirs with | [] -> (None, []) - | [ stdlib_dir ] -> (Some (Path.external_ stdlib_dir), []) - | stdlib_dir :: extra_obj_dirs -> - ( Some (Path.external_ stdlib_dir) - , List.map ~f:Path.external_ extra_obj_dirs )) + | [ stdlib_dir ] -> (Some stdlib_dir, []) + | stdlib_dir :: extra_obj_dirs -> (Some stdlib_dir, extra_obj_dirs)) in let* flags = flags and* src_dirs, obj_dirs =