Fix merlin after rebase

Signed-off-by: Ulysse Gérard <[email protected]>
ocaml · Dec 22, 2022 · a0b1dc2 · a0b1dc2
1 parent 691387c
commit a0b1dc2
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/src/dune_rules/merlin.ml b/src/dune_rules/merlin.ml
@@ -53,10 +53,18 @@ module Processed = struct
     }
 
   let dyn_of_config
-      { stdlib_dir; obj_dirs; src_dirs; flags; extensions; melc_flags } =
+      { build_dir
+      ; stdlib_dir
+      ; obj_dirs
+      ; src_dirs
+      ; flags
+      ; extensions
+      ; melc_flags
+      } =
     let open Dyn in
     record
-      [ ("stdlib_dir", option Path.to_dyn stdlib_dir)
+      [ ("build_dir", Path.to_dyn build_dir)
+      ; ("stdlib_dir", option Path.to_dyn stdlib_dir)
       ; ("obj_dirs", Path.Set.to_dyn obj_dirs)
       ; ("src_dirs", Path.Set.to_dyn src_dirs)
       ; ("flags", list string flags)
@@ -120,7 +128,14 @@ module Processed = struct
   let serialize_path = Path.to_absolute_filename
 
   let to_sexp ~opens ~pp
-      { build_dir; stdlib_dir; obj_dirs; src_dirs; flags; extensions; melc_flags } =
+      { build_dir
+      ; stdlib_dir
+      ; obj_dirs
+      ; src_dirs
+      ; flags
+      ; extensions
+      ; melc_flags
+      } =
     let make_directive tag value = Sexp.List [ Atom tag; value ] in
     let make_directive_of_path tag path =
       make_directive tag (Sexp.Atom (serialize_path path))