Skip to content

OCaml 5.2.0 #6797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,12 @@ jobs:
uses: actions/checkout@v4

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

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

Expand Down Expand Up @@ -172,7 +172,7 @@ jobs:
ubuntu-latest,
windows-latest,
]
ocaml_compiler: [5.1.1]
ocaml_compiler: [5.2.0]

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

Expand Down Expand Up @@ -225,7 +225,7 @@ jobs:
uses: ocaml/setup-ocaml@v2
if: matrix.os == 'windows-latest'
with:
ocaml-compiler: ocaml-variants.5.1.1+options,ocaml-option-mingw
ocaml-compiler: ocaml-variants.5.2.0+options,ocaml-option-mingw
opam-pin: false
opam-depext: false
opam-repositories: |
Expand Down Expand Up @@ -306,7 +306,7 @@ jobs:
# Build the playground compiler on the fastest runner (ubuntu-latest)
- name: Install JSOO
if: matrix.os == 'ubuntu-latest'
run: opam install js_of_ocaml.5.6.0
run: opam install js_of_ocaml.5.8.1

- name: Build playground compiler
if: matrix.os == 'ubuntu-latest'
Expand Down
2 changes: 1 addition & 1 deletion .ocamlformat
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
profile = default
version = 0.26.1
version = 0.26.2

field-space = tight-decl
break-cases = toplevel
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

#### :house: Internal

- Build with OCaml 5.1.1. https://github.com/rescript-lang/rescript-compiler/pull/6641
- Build with OCaml 5.2.0. https://github.com/rescript-lang/rescript-compiler/pull/6797
- Convert OCaml codebase to snake case style. https://github.com/rescript-lang/rescript-compiler/pull/6702
- Fix location of let bindings with attributes. https://github.com/rescript-lang/rescript-compiler/pull/6791
- Refactor uppercase exotic ident handling. https://github.com/rescript-lang/rescript-compiler/pull/6779
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Make sure you have [opam](https://opam.ocaml.org/doc/Install.html) installed on
opam init

# Any recent OCaml version works as a development compiler
opam switch create 5.1.1 # can also create local switch with opam switch create
opam switch create 5.2.0 # can also create local switch with opam switch create

# Install dev dependencies from OPAM
opam install . --deps-only
Expand Down
6 changes: 3 additions & 3 deletions dune-project
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
(ocaml
(>= 4.10))
(ocamlformat
(= 0.26.1))
(= 0.26.2))
(cppo
(= 1.6.9))
(js_of_ocaml-compiler
(= 5.6.0))
(= 5.8.1))
(ounit2
(= 2.2.7))
(reanalyze
(= 2.24.0))
(= 2.25.1))
dune))
1 change: 0 additions & 1 deletion jscomp/ext/ext_buffer.mli
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ val clear : t -> unit
(** Empty the buffer. *)

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

val add_string : t -> string -> unit
Expand Down
4 changes: 2 additions & 2 deletions jscomp/ext/literals.ml
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,10 @@ let esmodule = "esmodule"
let commonjs = "commonjs"

let es6 = "es6"
[@@ocaml.deprecated "Will be removed in v12"]
(* [@@deprecated "Will be removed in v12"] *)

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

let unused_attribute = "Unused attribute "

Expand Down
2 changes: 0 additions & 2 deletions jscomp/ext/map_gen.mli
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,8 @@ val height : ('a, 'b) t -> int
val singleton : 'a -> 'b -> ('a, 'b) t

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

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

val bal : ('a, 'b) t -> 'a -> 'b -> ('a, 'b) t -> ('a, 'b) t
Expand Down
2 changes: 1 addition & 1 deletion jscomp/ext/set_gen.mli
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ type 'a t = private

val empty : 'a t

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

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

Expand Down
2 changes: 1 addition & 1 deletion jscomp/js_parser/flow_ast_mapper.ml
Original file line number Diff line number Diff line change
Expand Up @@ -1504,7 +1504,7 @@ class ['loc] mapper =
updated to override those individually. *)
method function_expression_or_method loc (stmt : ('loc, 'loc) Ast.Function.t) =
this#function_ loc stmt
[@@alert deprecated "Use either function_expression or class_method"]
(* [@@alert deprecated "Use either function_expression or class_method"] *)

(* Internal helper for function declarations, function expressions and arrow functions *)
method function_ _loc (expr : ('loc, 'loc) Ast.Function.t) =
Expand Down
6 changes: 3 additions & 3 deletions rescript.opam
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ homepage: "https://github.com/rescript-lang/rescript-compiler"
bug-reports: "https://github.com/rescript-lang/rescript-compiler/issues"
depends: [
"ocaml" {>= "4.10"}
"ocamlformat" {= "0.26.1"}
"ocamlformat" {= "0.26.2"}
"cppo" {= "1.6.9"}
"js_of_ocaml-compiler" {= "5.6.0"}
"js_of_ocaml-compiler" {= "5.8.1"}
"ounit2" {= "2.2.7"}
"reanalyze" {= "2.24.0"}
"reanalyze" {= "2.25.1"}
"dune"
]
build: [
Expand Down