diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index caf20fcf8f..469b8660b8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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" @@ -172,7 +172,7 @@ jobs: ubuntu-latest, windows-latest, ] - ocaml_compiler: [5.1.1] + ocaml_compiler: [5.2.0] runs-on: ${{matrix.os}} @@ -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: | @@ -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' diff --git a/.ocamlformat b/.ocamlformat index 87496a1255..ad5b55b6f8 100644 --- a/.ocamlformat +++ b/.ocamlformat @@ -1,5 +1,5 @@ profile = default -version = 0.26.1 +version = 0.26.2 field-space = tight-decl break-cases = toplevel diff --git a/CHANGELOG.md b/CHANGELOG.md index 03dbda2c61..495de97b89 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f1f2d7c0d2..c9f7cc4a71 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 diff --git a/dune-project b/dune-project index eeb7f450c3..40275f2713 100644 --- a/dune-project +++ b/dune-project @@ -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)) diff --git a/jscomp/ext/ext_buffer.mli b/jscomp/ext/ext_buffer.mli index 38ae58e8ae..a00115b95f 100644 --- a/jscomp/ext/ext_buffer.mli +++ b/jscomp/ext/ext_buffer.mli @@ -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 diff --git a/jscomp/ext/literals.ml b/jscomp/ext/literals.ml index b1aa1c2bc5..ad38631930 100644 --- a/jscomp/ext/literals.ml +++ b/jscomp/ext/literals.ml @@ -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 " diff --git a/jscomp/ext/map_gen.mli b/jscomp/ext/map_gen.mli index 4ecd0070e7..a1452460a4 100644 --- a/jscomp/ext/map_gen.mli +++ b/jscomp/ext/map_gen.mli @@ -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 diff --git a/jscomp/ext/set_gen.mli b/jscomp/ext/set_gen.mli index a1c838c552..0dac4f5955 100644 --- a/jscomp/ext/set_gen.mli +++ b/jscomp/ext/set_gen.mli @@ -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 diff --git a/jscomp/js_parser/flow_ast_mapper.ml b/jscomp/js_parser/flow_ast_mapper.ml index 60050c7bf2..388ec00d6a 100644 --- a/jscomp/js_parser/flow_ast_mapper.ml +++ b/jscomp/js_parser/flow_ast_mapper.ml @@ -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) = diff --git a/rescript.opam b/rescript.opam index 9cc10b48c8..9f65797b65 100644 --- a/rescript.opam +++ b/rescript.opam @@ -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: [