From 03488297f6cd0ce246cdba66c2fa9f6b0671cd86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulysse=20G=C3=A9rard?= Date: Wed, 9 Oct 2024 13:37:59 +0200 Subject: [PATCH] Bump Merlin conf version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ulysse Gérard --- src/dune_rules/merlin/merlin.ml | 2 +- test/expect-tests/persistent_tests.ml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/dune_rules/merlin/merlin.ml b/src/dune_rules/merlin/merlin.ml index 19cfb2f864a9..ab31744ef1f2 100644 --- a/src/dune_rules/merlin/merlin.ml +++ b/src/dune_rules/merlin/merlin.ml @@ -119,7 +119,7 @@ module Processed = struct type nonrec t = t let name = "merlin-conf" - let version = 5 + let version = 6 let to_dyn _ = Dyn.String "Use [dune ocaml dump-dot-merlin] instead" let test_example () = diff --git a/test/expect-tests/persistent_tests.ml b/test/expect-tests/persistent_tests.ml index 7f386431cc6c..159f9993c1ac 100644 --- a/test/expect-tests/persistent_tests.ml +++ b/test/expect-tests/persistent_tests.ml @@ -43,8 +43,8 @@ let%expect_test "persistent digests" = 7dac5b11f6f654bb6f230392493b363f --- - merlin-conf version 5 - 49e3a1010b7218f5b229d98991d6d11d + merlin-conf version 6 + 880477921df9a8915d57c0e8bdfb2fc1 --- INCREMENTAL-DB version 5