Code

Merge 5.2.0minus-5#124

Code

Merged

liam923 merged 26 commits intomainjanestreet/merlin-jst:mainfrom merge-5.2.0minus-5janestreet/merlin-jst:merge-5.2.0minus-5Copy head branch name to clipboardJan 20, 2025

+29,934-22,019

Commits

Commits on Jan 15, 2025

• Import ocaml sources for ocaml-flambda/flambda-backend@df4a6e0ba4f

  liam923

  committed
  b33fec7

  Copy full SHA for b33fec7

• Commit merge conflicts

  liam923

  committed
  528724d

  Copy full SHA for 528724d

• Resolve syntax errors

  liam923

  committed
  6b39779

  Copy full SHA for 6b39779

• Fix type issues in shared code

  liam923

  committed
  7c93201

  Copy full SHA for 7c93201

Commits on Jan 16, 2025

• Fix some merlin-specific stuff

  liam923

  committed
  c8b2cc4

  Copy full SHA for c8b2cc4

• Fix construct

  liam923

  committed
  4002d4a

  Copy full SHA for 4002d4a

• Fix typedtree_utils

  liam923

  committed
  f66694f

  Copy full SHA for f66694f

• Fix ptyp_of_type

  liam923

  committed
  7292261

  Copy full SHA for 7292261

• Fix stack_or_heap_enclosing

  liam923

  committed
  7cfc797

  Copy full SHA for 7cfc797

• Fix tail_anaylsis

  liam923

  committed
  4b21242

  Copy full SHA for 4b21242

• Fix context

  liam923

  committed
  7514f11

  Copy full SHA for 7514f11

• Fix env_lookup

  liam923

  committed
  cfd457d

  Copy full SHA for cfd457d

• Fix completion

  liam923

  committed
  c953d0b

  Copy full SHA for c953d0b

• Update magic numbers

  liam923

  committed
  23201d1

  Copy full SHA for 23201d1

• Add flags to ignore

  liam923

  committed
  e2c59c1

  Copy full SHA for e2c59c1

• Promote failing tests

  liam923

  committed
  2678281

  Copy full SHA for 2678281

• Fix record error recovery

  liam923

  committed
  d291bf7

  Copy full SHA for d291bf7

• Fix typed holes

  liam923

  committed
  a7cb11c

  Copy full SHA for a7cb11c

• Promote failing test

  liam923

  committed
  3e215a3

  Copy full SHA for 3e215a3

• Create unboxed record tests

  liam923

  committed
  5bc4abe

  Copy full SHA for 5bc4abe

• Rename Tmod_hole to Tmod_typed_hole

  liam923

  committed
  04d0658

  Copy full SHA for 04d0658

• Add test for constructing in a Texp_hole

  liam923

  committed
  7c738d2

  Copy full SHA for 7c738d2

Commits on Jan 17, 2025

• Update ci to use ocaml/setup-ocaml@v3

  liam923

  committed
  1ea732e

  Copy full SHA for 1ea732e

• Fix formatting

  liam923

  committed
  575c83e

  Copy full SHA for 575c83e

• Disable flaky stack-or-heap test

  liam923

  committed
  37a2bc9

  Copy full SHA for 37a2bc9

Commits on Jan 20, 2025

• Respond to pr feedback

  liam923

  committed
  2a25b38

  Copy full SHA for 2a25b38