Skip to content

Commit d2604ad

Browse files
authored
OCaml 5.2.0 (#6797)
1 parent 8a3928a commit d2604ad

11 files changed

+18
-21
lines changed

.github/workflows/ci.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,12 @@ jobs:
9999
uses: actions/checkout@v4
100100

101101
- name: Build compiler binaries
102-
uses: docker://ghcr.io/rescript-lang/rescript-ci-build:alpine-3.19-ocaml-5.1.1-01
102+
uses: docker://ghcr.io/rescript-lang/rescript-ci-build:alpine-3.20-ocaml-5.2.0-01
103103
with:
104104
args: opam exec -- dune build --display quiet --profile static
105105

106106
- name: Build ninja binary
107-
uses: docker://ghcr.io/rescript-lang/rescript-ci-build:alpine-3.19-ocaml-5.1.1-01
107+
uses: docker://ghcr.io/rescript-lang/rescript-ci-build:alpine-3.20-ocaml-5.2.0-01
108108
with:
109109
args: sh -c "cd ninja && LDFLAGS=-static python3 configure.py --bootstrap"
110110

@@ -172,7 +172,7 @@ jobs:
172172
ubuntu-latest,
173173
windows-latest,
174174
]
175-
ocaml_compiler: [5.1.1]
175+
ocaml_compiler: [5.2.0]
176176

177177
runs-on: ${{matrix.os}}
178178

@@ -225,7 +225,7 @@ jobs:
225225
uses: ocaml/setup-ocaml@v2
226226
if: matrix.os == 'windows-latest'
227227
with:
228-
ocaml-compiler: ocaml-variants.5.1.1+options,ocaml-option-mingw
228+
ocaml-compiler: ocaml-variants.5.2.0+options,ocaml-option-mingw
229229
opam-pin: false
230230
opam-depext: false
231231
opam-repositories: |
@@ -306,7 +306,7 @@ jobs:
306306
# Build the playground compiler on the fastest runner (ubuntu-latest)
307307
- name: Install JSOO
308308
if: matrix.os == 'ubuntu-latest'
309-
run: opam install js_of_ocaml.5.6.0
309+
run: opam install js_of_ocaml.5.8.1
310310

311311
- name: Build playground compiler
312312
if: matrix.os == 'ubuntu-latest'

.ocamlformat

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
profile = default
2-
version = 0.26.1
2+
version = 0.26.2
33

44
field-space = tight-decl
55
break-cases = toplevel

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
#### :house: Internal
4242

43-
- Build with OCaml 5.1.1. https://github.com/rescript-lang/rescript-compiler/pull/6641
43+
- Build with OCaml 5.2.0. https://github.com/rescript-lang/rescript-compiler/pull/6797
4444
- Convert OCaml codebase to snake case style. https://github.com/rescript-lang/rescript-compiler/pull/6702
4545
- Fix location of let bindings with attributes. https://github.com/rescript-lang/rescript-compiler/pull/6791
4646
- Refactor uppercase exotic ident handling. https://github.com/rescript-lang/rescript-compiler/pull/6779

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Make sure you have [opam](https://opam.ocaml.org/doc/Install.html) installed on
4242
opam init
4343

4444
# Any recent OCaml version works as a development compiler
45-
opam switch create 5.1.1 # can also create local switch with opam switch create
45+
opam switch create 5.2.0 # can also create local switch with opam switch create
4646

4747
# Install dev dependencies from OPAM
4848
opam install . --deps-only

dune-project

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
(ocaml
2222
(>= 4.10))
2323
(ocamlformat
24-
(= 0.26.1))
24+
(= 0.26.2))
2525
(cppo
2626
(= 1.6.9))
2727
(js_of_ocaml-compiler
28-
(= 5.6.0))
28+
(= 5.8.1))
2929
(ounit2
3030
(= 2.2.7))
3131
(reanalyze
32-
(= 2.24.0))
32+
(= 2.25.1))
3333
dune))

jscomp/ext/ext_buffer.mli

-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ val clear : t -> unit
5151
(** Empty the buffer. *)
5252

5353
val add_char : t -> char -> unit
54-
[@@inline]
5554
(** [add_char b c] appends the character [c] at the end of the buffer [b]. *)
5655

5756
val add_string : t -> string -> unit

jscomp/ext/literals.ml

+2-2
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,10 @@ let esmodule = "esmodule"
130130
let commonjs = "commonjs"
131131

132132
let es6 = "es6"
133-
[@@ocaml.deprecated "Will be removed in v12"]
133+
(* [@@deprecated "Will be removed in v12"] *)
134134

135135
let es6_global = "es6-global"
136-
[@@ocaml.deprecated "Will be removed in v12"]
136+
(* [@@deprecated "Will be removed in v12"] *)
137137

138138
let unused_attribute = "Unused attribute "
139139

jscomp/ext/map_gen.mli

-2
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,8 @@ val height : ('a, 'b) t -> int
2222
val singleton : 'a -> 'b -> ('a, 'b) t
2323

2424
val unsafe_node : 'a -> 'b -> ('a, 'b) t -> ('a, 'b) t -> int -> ('a, 'b) t
25-
[@@inline]
2625

2726
val unsafe_two_elements : 'a -> 'b -> 'a -> 'b -> ('a, 'b) t
28-
[@@inline]
2927
(** smaller comes first *)
3028

3129
val bal : ('a, 'b) t -> 'a -> 'b -> ('a, 'b) t -> ('a, 'b) t

jscomp/ext/set_gen.mli

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ type 'a t = private
55

66
val empty : 'a t
77

8-
val is_empty : 'a t -> bool [@@inline]
8+
val is_empty : 'a t -> bool
99

1010
val unsafe_two_elements : 'a -> 'a -> 'a t
1111

jscomp/js_parser/flow_ast_mapper.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1504,7 +1504,7 @@ class ['loc] mapper =
15041504
updated to override those individually. *)
15051505
method function_expression_or_method loc (stmt : ('loc, 'loc) Ast.Function.t) =
15061506
this#function_ loc stmt
1507-
[@@alert deprecated "Use either function_expression or class_method"]
1507+
(* [@@alert deprecated "Use either function_expression or class_method"] *)
15081508

15091509
(* Internal helper for function declarations, function expressions and arrow functions *)
15101510
method function_ _loc (expr : ('loc, 'loc) Ast.Function.t) =

rescript.opam

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ homepage: "https://github.com/rescript-lang/rescript-compiler"
88
bug-reports: "https://github.com/rescript-lang/rescript-compiler/issues"
99
depends: [
1010
"ocaml" {>= "4.10"}
11-
"ocamlformat" {= "0.26.1"}
11+
"ocamlformat" {= "0.26.2"}
1212
"cppo" {= "1.6.9"}
13-
"js_of_ocaml-compiler" {= "5.6.0"}
13+
"js_of_ocaml-compiler" {= "5.8.1"}
1414
"ounit2" {= "2.2.7"}
15-
"reanalyze" {= "2.24.0"}
15+
"reanalyze" {= "2.25.1"}
1616
"dune"
1717
]
1818
build: [

0 commit comments

Comments
 (0)