Skip to content

Commit 028a45b

Browse files
committed
Bump magic numbers
1 parent b8a8b5b commit 028a45b

File tree

3 files changed

+19
-18
lines changed

3 files changed

+19
-18
lines changed

src/ocaml/typing/magic_numbers.ml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ module Cmi = struct
6666
| "Caml1999I558" -> Some "5.2.0minus-8"
6767
| "Caml1999I559" -> Some "5.2.0minus-9"
6868
| "Caml1999I560" -> Some "5.2.0minus-10"
69+
| "Caml1999I561" -> Some "5.2.0minus-11"
6970
| _ -> None
7071

7172
let () = assert (to_version_opt Config.cmi_magic_number <> None)

src/ocaml/utils/config.ml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@
3131
let version = Sys.ocaml_version
3232

3333
(* When bumping this number, be sure to also update ../typing/magic_numbers.ml *)
34-
let cmi_magic_number = "Caml1999I560"
34+
let cmi_magic_number = "Caml1999I561"
3535

36-
let ast_impl_magic_number = "Caml1999M560"
37-
let ast_intf_magic_number = "Caml1999N560"
38-
let cmt_magic_number = "Caml1999T560"
39-
let cms_magic_number = "Caml1999S560"
40-
let index_magic_number = "Merl2023I560"
36+
let ast_impl_magic_number = "Caml1999M561"
37+
let ast_intf_magic_number = "Caml1999N561"
38+
let cmt_magic_number = "Caml1999T561"
39+
let cms_magic_number = "Caml1999S561"
40+
let index_magic_number = "Merl2023I561"
4141

4242
let interface_suffix = ref ".mli"
4343

tests/test-dirs/version.t

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
$ $MERLIN single version | revert-newlines | jq .value.magicNumbers
22
{
3-
"cmi_magic_number": "Caml1999I560",
4-
"ast_intf_magic_number": "Caml1999N560",
5-
"ast_impl_magic_number": "Caml1999M560",
6-
"cmt_magic_number": "Caml1999T560",
7-
"cms_magic_number": "Caml1999S560",
8-
"index_magic_number": "Merl2023I560"
3+
"cmi_magic_number": "Caml1999I561",
4+
"ast_intf_magic_number": "Caml1999N561",
5+
"ast_impl_magic_number": "Caml1999M561",
6+
"cmt_magic_number": "Caml1999T561",
7+
"cms_magic_number": "Caml1999S561",
8+
"index_magic_number": "Merl2023I561"
99
}
1010

1111
$ ocaml-index magic-numbers | jq
1212
{
13-
"cmi_magic_number": "Caml1999I560",
14-
"ast_intf_magic_number": "Caml1999N560",
15-
"ast_impl_magic_number": "Caml1999M560",
16-
"cmt_magic_number": "Caml1999T560",
17-
"cms_magic_number": "Caml1999S560",
18-
"index_magic_number": "Merl2023I560"
13+
"cmi_magic_number": "Caml1999I561",
14+
"ast_intf_magic_number": "Caml1999N561",
15+
"ast_impl_magic_number": "Caml1999M561",
16+
"cmt_magic_number": "Caml1999T561",
17+
"cms_magic_number": "Caml1999S561",
18+
"index_magic_number": "Merl2023I561"
1919
}
2020

2121
Verify there is no difference between Merlin and Ocaml-index

0 commit comments

Comments
 (0)