Update merlin for 5.2.0minus-10 (#144)

* Import ocaml sources for oxcaml/oxcaml@d8dbd01dd6

* magic number updates for 5.2.0minus-10

Author: ccasin

src/ocaml/typing/magic_numbers.ml

@@ -65,6 +65,7 @@ module Cmi = struct
     | "Caml1999I557" -> Some "5.2.0minus-7"
     | "Caml1999I558" -> Some "5.2.0minus-8"
     | "Caml1999I559" -> Some "5.2.0minus-9"
+    | "Caml1999I560" -> Some "5.2.0minus-10"
     | _ -> None
 
   let () = assert (to_version_opt Config.cmi_magic_number <> None)

src/ocaml/utils/config.ml

@@ -31,13 +31,13 @@
 let version = Sys.ocaml_version
 
 (* When bumping this number, be sure to also update ../typing/magic_numbers.ml *)
-let cmi_magic_number = "Caml1999I559"
+let cmi_magic_number = "Caml1999I560"
 
-let ast_impl_magic_number = "Caml1999M559"
-let ast_intf_magic_number = "Caml1999N559"
-let cmt_magic_number = "Caml1999T559"
-let cms_magic_number = "Caml1999S559"
-let index_magic_number = "Merl2023I559"
+let ast_impl_magic_number = "Caml1999M560"
+let ast_intf_magic_number = "Caml1999N560"
+let cmt_magic_number = "Caml1999T560"
+let cms_magic_number = "Caml1999S560"
+let index_magic_number = "Merl2023I560"
 
 let interface_suffix = ref ".mli"
 

tests/test-dirs/version.t

@@ -1,21 +1,21 @@
   $ $MERLIN single version | revert-newlines | jq .value.magicNumbers
   {
-    "cmi_magic_number": "Caml1999I559",
-    "ast_intf_magic_number": "Caml1999N559",
-    "ast_impl_magic_number": "Caml1999M559",
-    "cmt_magic_number": "Caml1999T559",
-    "cms_magic_number": "Caml1999S559",
-    "index_magic_number": "Merl2023I559"
+    "cmi_magic_number": "Caml1999I560",
+    "ast_intf_magic_number": "Caml1999N560",
+    "ast_impl_magic_number": "Caml1999M560",
+    "cmt_magic_number": "Caml1999T560",
+    "cms_magic_number": "Caml1999S560",
+    "index_magic_number": "Merl2023I560"
   }
 
   $ ocaml-index magic-numbers | jq
   {
-    "cmi_magic_number": "Caml1999I559",
-    "ast_intf_magic_number": "Caml1999N559",
-    "ast_impl_magic_number": "Caml1999M559",
-    "cmt_magic_number": "Caml1999T559",
-    "cms_magic_number": "Caml1999S559",
-    "index_magic_number": "Merl2023I559"
+    "cmi_magic_number": "Caml1999I560",
+    "ast_intf_magic_number": "Caml1999N560",
+    "ast_impl_magic_number": "Caml1999M560",
+    "cmt_magic_number": "Caml1999T560",
+    "cms_magic_number": "Caml1999S560",
+    "index_magic_number": "Merl2023I560"
   }
 
 Verify there is no difference between Merlin and Ocaml-index

upstream/ocaml_flambda/base-rev.txt

@@ -1 +1 @@
-e06264f05b4317dd1120de78239de47957b42073
+d8dbd01dd6a0b4f0e39bbbf9caec4e5254ca5bb4