Ocaml 5.3 (rescript-lang#7294)

* OCaml 5.3 + some dependency upgrades * "effect" is a reserved word now * no 4.13 * ocamlformat 0.27.0 * Use OCaml 5.3.0 * Run reanalyze on OCaml 5.2.1

Author: cknitt

.devcontainer/postCreate.sh

@@ -2,7 +2,7 @@
 
 # Install dev dependencies from OPAM
 opam init -y --bare --disable-sandboxing
-opam switch create 5.2.1 --packages ocaml-option-static
+opam switch create 5.3.0 --packages ocaml-option-static
 opam install . --deps-only -y
 
 # For IDE support, install the OCaml language server

.github/workflows/ci.yml

@@ -87,32 +87,34 @@ jobs:
  matrix:
  include:
  - os: ubuntu-24.04 # x64
- ocaml_compiler: ocaml-variants.5.2.1+options,ocaml-option-static
+ ocaml_compiler: ocaml-variants.5.3.0+options,ocaml-option-static
  upload_binaries: true
  upload_libs: true
  - os: ubuntu-24.04-arm # ARM
- ocaml_compiler: ocaml-variants.5.2.1+options,ocaml-option-static
+ ocaml_compiler: ocaml-variants.5.3.0+options,ocaml-option-static
  upload_binaries: true
  # Build the playground compiler and run the benchmarks on the fastest runner
  build_playground: true
  benchmarks: true
  - os: macos-13 # x64
- ocaml_compiler: 5.2.1
+ ocaml_compiler: 5.3.0
  upload_binaries: true
  - os: macos-14 # ARM
- ocaml_compiler: 5.2.1
+ ocaml_compiler: 5.3.0
  upload_binaries: true
  - os: windows-latest
- ocaml_compiler: 5.2.1
+ ocaml_compiler: 5.3.0
  upload_binaries: true
 
  # Verify that the compiler still builds with older OCaml versions
+ - os: ubuntu-24.04
+ ocaml_compiler: ocaml-variants.5.2.1+options,ocaml-option-static
+ # Reanalyze does not work on OCaml 5.3.0 anymore, therefore run it on 5.2.1
+ run_reanalyze: true
  - os: ubuntu-24.04
  ocaml_compiler: ocaml-variants.5.0.0+options,ocaml-option-static
  - os: ubuntu-24.04
  ocaml_compiler: ocaml-variants.4.14.2+options,ocaml-option-static
- - os: ubuntu-24.04
- ocaml_compiler: ocaml-variants.4.13.0+options,ocaml-option-static
 
  runs-on: ${{matrix.os}}
 
@@ -299,6 +301,12 @@ jobs:
  if: ${{ runner.os == 'Windows' }}
  run: opam exec -- make test-syntax
 
+ - name: "Syntax: Run reanalyze"
+ if: matrix.run_reanalyze
+ run: |
+ opam install reanalyze
+ opam exec -- make reanalyze
+
  - name: Build runtime/stdlib
  run: ./scripts/buildRuntime.sh
  shell: bash

.ocamlformat

@@ -1,5 +1,5 @@
 profile = default
-version = 0.26.2
+version = 0.27.0
 
 field-space = tight-decl
 break-cases = toplevel
@@ -9,3 +9,4 @@ space-around-arrays = false
 space-around-lists = false
 space-around-records = false
 space-around-variants = false
+parse-docstrings = false

CONTRIBUTING.md

@@ -47,7 +47,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.2.1 # can also create local switch with opam switch create
+opam switch create 5.3.0 # can also create local switch with opam switch create
 
 # Install dev dependencies from OPAM
 opam install . --deps-only --with-test --with-dev-setup -y

Makefile

@@ -40,12 +40,10 @@ test-tools:
 
 test-syntax:
 bash ./scripts/test_syntax.sh
-make reanalyze
 bash ./scripts/testok.sh
 
 test-syntax-roundtrip:
 ROUNDTRIP_TEST=1 bash ./scripts/test_syntax.sh
-make reanalyze
 bash ./scripts/testok.sh
 
 test-gentype:

analysis.opam

@@ -7,8 +7,8 @@ license: "LGPL-3.0-or-later"
 homepage: "https://github.com/rescript-lang/rescript-compiler"
 bug-reports: "https://github.com/rescript-lang/rescript-compiler/issues"
 depends: [
- "ocaml" {>= "4.10"}
- "cppo" {= "1.6.9"}
+ "ocaml" {>= "4.14"}
+ "cppo" {= "1.8.0"}
  "dune"
 ]
 build: [

analysis/reanalyze/src/DeadCommon.ml

@@ -555,7 +555,8 @@ module Decl = struct
  let refIsBelow (pos : Lexing.position) =
  decl.pos.pos_fname <> pos.pos_fname
  || decl.pos.pos_cnum < pos.pos_cnum
- && (* not a function defined inside a function, e.g. not a callback *)
+ &&
+ (* not a function defined inside a function, e.g. not a callback *)
  decl.posEnd.pos_cnum < pos.pos_cnum
  in
  refs |> PosSet.exists refIsBelow

analysis/src/SignatureHelp.ml

@@ -553,44 +553,44 @@ let signatureHelp ~path ~pos ~currentFile ~debug ~allowForConstructorPayloads =
  let offset = ref 0 in
  Some
  (`InlineRecord
- (fields
- |> List.map (fun (field : field) ->
- let startOffset = !offset in
- let argText =
- Printf.sprintf "%s%s: %s" field.fname.txt
- (if field.optional then "?" else "")
- (Shared.typeToString
- (if field.optional then
- Utils.unwrapIfOption field.typ
- else field.typ))
- in
- let endOffset =
- startOffset + String.length argText
- in
- offset := endOffset + String.length ", ";
- (argText, field, (startOffset, endOffset)))))
+  (fields
+  |> List.map (fun (field : field) ->
+  let startOffset = !offset in
+  let argText =
+  Printf.sprintf "%s%s: %s" field.fname.txt
+  (if field.optional then "?" else "")
+  (Shared.typeToString
+  (if field.optional then
+  Utils.unwrapIfOption field.typ
+  else field.typ))
+  in
+  let endOffset =
+  startOffset + String.length argText
+  in
+  offset := endOffset + String.length ", ";
+  (argText, field, (startOffset, endOffset)))))
  | Args [(typ, _)] ->
  Some
  (`SingleArg
- ( typ |> Shared.typeToString,
- docsForLabel ~file:full.file ~package:full.package
- ~supportsMarkdownLinks typ ))
+  ( typ |> Shared.typeToString,
+  docsForLabel ~file:full.file ~package:full.package
+  ~supportsMarkdownLinks typ ))
  | Args args ->
  let offset = ref 0 in
  Some
  (`TupleArg
- (args
- |> List.map (fun (typ, _) ->
- let startOffset = !offset in
- let argText = typ |> Shared.typeToString in
- let endOffset =
- startOffset + String.length argText
- in
- offset := endOffset + String.length ", ";
- ( argText,
- docsForLabel ~file:full.file ~package:full.package
- ~supportsMarkdownLinks typ,
- (startOffset, endOffset) ))))
+  (args
+  |> List.map (fun (typ, _) ->
+  let startOffset = !offset in
+  let argText = typ |> Shared.typeToString in
+  let endOffset =
+  startOffset + String.length argText
+  in
+  offset := endOffset + String.length ", ";
+  ( argText,
+  docsForLabel ~file:full.file ~package:full.package
+  ~supportsMarkdownLinks typ,
+  (startOffset, endOffset) ))))
  in
  let label =
  constructor.name ^ "("

compiler/bsb/bsb_exception.ml

@@ -40,7 +40,8 @@ let print (fmt : Format.formatter) (x : error) =
  | Conflict_module (modname, dir1, dir2) ->
  Format.fprintf fmt
  "@{<error>Error:@} %s found in two directories: (%s, %s)\n\
- File names must be unique per project" modname dir1 dir2
+ File names must be unique per project"
+ modname dir1 dir2
  | No_implementation modname ->
  Format.fprintf fmt "@{<error>Error:@} %s does not have implementation file"
  modname
@@ -51,12 +52,14 @@ let print (fmt : Format.formatter) (x : error) =
  "File \"bsconfig.json\", line 1\n\
  @{<error>Error:@} package @{<error>%s@} is not found\n\
  It's the basic, required package. If you have it installed globally,\n\
- Please run `npm link rescript` to make it available" name
+ Please run `npm link rescript` to make it available"
+ name
  else
  Format.fprintf fmt
  "File \"bsconfig.json\", line 1\n\
  @{<error>Error:@} package @{<error>%s@} not found or built\n\
- - Did you install it?" name
+ - Did you install it?"
+ name
  | Json_config (pos, s) ->
  Format.fprintf fmt
  "File %S, line %d:\n\

compiler/bsb/bsb_ninja_check.ml

@@ -114,8 +114,9 @@ let record ~(package_kind : Bsb_package_kind.t) ~per_proj_dir ~file
  record_global_atime buf Sys.executable_name;
  Ext_list.iter config.ppx_files (fun {name; args = _} ->
  try record_global_atime buf name
- with _ -> (* record the ppx files as a best effort *)
- ());
+ with _ ->
+ (* record the ppx files as a best effort *)
+ ());
  let oc = open_out_bin file in
  Ext_buffer.output_buffer oc buf;
  close_out oc