Merge branch 'master' into test-docstrings-examples

Author: aspeddro

.devcontainer/postCreate.sh

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

.github/workflows/ci.yml

@@ -87,23 +87,23 @@ jobs:
       matrix:
         include:
           - os: ubuntu-latest # x64
-            ocaml_compiler: ocaml-variants.5.2.0+options,ocaml-option-static
+            ocaml_compiler: ocaml-variants.5.2.1+options,ocaml-option-static
             upload_binaries: true
             upload_libs: true
             # Build the playground compiler and run the benchmarks on the fastest runner
             build_playground: true
             benchmarks: true
           - os: buildjet-2vcpu-ubuntu-2204-arm # ARM
-            ocaml_compiler: ocaml-variants.5.2.0+options,ocaml-option-static
+            ocaml_compiler: ocaml-variants.5.2.1+options,ocaml-option-static
             upload_binaries: true
           - os: macos-13 # x64
-            ocaml_compiler: 5.2.0
+            ocaml_compiler: 5.2.1
             upload_binaries: true
           - os: macos-14 # ARM
-            ocaml_compiler: 5.2.0
+            ocaml_compiler: 5.2.1
             upload_binaries: true
           - os: windows-latest
-            ocaml_compiler: 5.2.0
+            ocaml_compiler: 5.2.1
             upload_binaries: true
 
           # Verify that the compiler still builds with older OCaml versions
@@ -151,7 +151,7 @@ jobs:
       # matrix.ocaml_compiler may contain commas
       - name: Get OPAM cache key
         shell: bash
-        run: echo "opam_cache_key=opam-env-v5-${{ matrix.os }}-${{ matrix.ocaml_compiler }}-${{ hashFiles('dune-project') }}" | sed 's/,/-/g' >> $GITHUB_ENV
+        run: echo "opam_cache_key=opam-env-v6-${{ matrix.os }}-${{ matrix.ocaml_compiler }}-${{ hashFiles('dune-project') }}" | sed 's/,/-/g' >> $GITHUB_ENV
 
       - name: Restore OPAM environment
         id: cache-opam-env
@@ -167,7 +167,7 @@ jobs:
           key: ${{ env.opam_cache_key }}
 
       - name: Use OCaml ${{matrix.ocaml_compiler}}
-        uses: ocaml/setup-ocaml@v3.0.15
+        uses: ocaml/setup-ocaml@v3.1.4
         if: steps.cache-opam-env.outputs.cache-hit != 'true'
         with:
           ocaml-compiler: ${{matrix.ocaml_compiler}}

CHANGELOG.md

@@ -12,6 +12,7 @@
 
 # 12.0.0-alpha.6 (Unreleased)
 - Fix exponential notation syntax. https://github.com/rescript-lang/rescript/pull/7174
+- Add `Option.all` & `Result.all` helpers. https://github.com/rescript-lang/rescript/pull/7181
 
 #### :bug: Bug fix
 - Fix bug where a ref assignment is moved ouside a conditional. https://github.com/rescript-lang/rescript/pull/7176
@@ -23,7 +24,10 @@
 - Ast cleanup: remove exp object and exp unreachable. https://github.com/rescript-lang/rescript/pull/7189
 - Ast cleanup: explicit representation for optional record fields in types. https://github.com/rescript-lang/rescript/pull/7190 https://github.com/rescript-lang/rescript/pull/7191
 - AST cleanup: first-class expression and patterns for records with optional fields. https://github.com/rescript-lang/rescript/pull/7192
-
+- AST cleanup: Represent the arity of uncurried function definitions directly in the AST. https://github.com/rescript-lang/rescript/pull/7197
+- AST cleanup: Remove Pexp_function from the AST. https://github.com/rescript-lang/rescript/pull/7198
+- Remove unused code from Location and Rescript_cpp modules. https://github.com/rescript-lang/rescript/pull/7150
+- Build with OCaml 5.2.1. https://github.com/rescript-lang/rescript-compiler/pull/7201
 
 # 12.0.0-alpha.5
 

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

analysis/reanalyze/src/Arnold.ml

@@ -908,7 +908,7 @@ module Compile = struct
         let open Command in
         c +++ ConstrOption Rnone
       | _ -> c)
-    | Texp_function {cases} -> cases |> List.map (case ~ctx) |> Command.nondet
+    | Texp_function {case = case_} -> case ~ctx case_
     | Texp_match (e, casesOk, casesExn, _partial)
       when not
              (casesExn

analysis/reanalyze/src/DeadValue.ml

@@ -156,18 +156,16 @@ let rec collectExpr super self (e : Typedtree.expression) =
           exp_desc =
             Texp_function
               {
-                cases =
-                  [
-                    {
-                      c_lhs = {pat_desc = Tpat_var (etaArg, _)};
-                      c_rhs =
-                        {
-                          exp_desc =
-                            Texp_apply
-                              ({exp_desc = Texp_ident (idArg2, _, _)}, args);
-                        };
-                    };
-                  ];
+                case =
+                  {
+                    c_lhs = {pat_desc = Tpat_var (etaArg, _)};
+                    c_rhs =
+                      {
+                        exp_desc =
+                          Texp_apply
+                            ({exp_desc = Texp_ident (idArg2, _, _)}, args);
+                      };
+                  };
               };
         } )
     when Ident.name idArg = "arg"

analysis/src/CompletionFrontEnd.ml

@@ -1318,7 +1318,7 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor
             match exprToContextPath lhs with
             | Some contextPath -> setResult (Cpath (CPObj (contextPath, label)))
             | None -> ())
-        | Pexp_fun (lbl, defaultExpOpt, pat, e) ->
+        | Pexp_fun (lbl, defaultExpOpt, pat, e, _) ->
           let oldScope = !scope in
           (match (!processingFun, !currentCtxPath) with
           | None, Some ctxPath -> processingFun := Some (ctxPath, 0)

analysis/src/DocumentSymbol.ml

@@ -41,7 +41,6 @@ let command ~path =
   let rec exprKind (exp : Parsetree.expression) =
     match exp.pexp_desc with
     | Pexp_fun _ -> Function
-    | Pexp_function _ -> Function
     | Pexp_constraint (e, _) -> exprKind e
     | Pexp_constant (Pconst_string _) -> String
     | Pexp_constant (Pconst_float _ | Pconst_integer _) -> Number

analysis/src/DumpAst.ml

@@ -213,7 +213,7 @@ and printExprItem expr ~pos ~indentation =
       | None -> ""
       | Some expr -> "," ^ printExprItem expr ~pos ~indentation)
     ^ ")"
-  | Pexp_fun (arg, _maybeDefaultArgExpr, pattern, nextExpr) ->
+  | Pexp_fun (arg, _maybeDefaultArgExpr, pattern, nextExpr, _) ->
     "Pexp_fun(\n"
     ^ addIndentation (indentation + 1)
     ^ "arg: "

analysis/src/Utils.ml

@@ -85,7 +85,6 @@ let identifyPexp pexp =
   | Parsetree.Pexp_ident _ -> "Pexp_ident"
   | Pexp_constant _ -> "Pexp_constant"
   | Pexp_let _ -> "Pexp_let"
-  | Pexp_function _ -> "Pexp_function"
   | Pexp_fun _ -> "Pexp_fun"
   | Pexp_apply _ -> "Pexp_apply"
   | Pexp_match _ -> "Pexp_match"