diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9119e90..f4b05e5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: os: - ubuntu-latest ocaml-compiler: - - 5.2.x + - 5.3.x runs-on: ${{ matrix.os }} diff --git a/.github/workflows/more-ci.yml b/.github/workflows/more-ci.yml index 5eaffd5..29d2690 100644 --- a/.github/workflows/more-ci.yml +++ b/.github/workflows/more-ci.yml @@ -29,12 +29,13 @@ jobs: - ubuntu-latest - windows-latest ocaml-compiler: + - 5.3.x - 5.2.x - 4.14.x exclude: # We exclude the combination already tested in the 'ci' workflow. - os: ubuntu-latest - ocaml-compiler: 5.2.x + ocaml-compiler: 5.3.x # We exclude windows-4.14 - this fails when building core. - os: windows-latest ocaml-compiler: 4.14.x diff --git a/.ocamlformat b/.ocamlformat index 04d5660..3802be7 100644 --- a/.ocamlformat +++ b/.ocamlformat @@ -1,2 +1,4 @@ version=0.27.0 +ocaml-version=4.14 profile=janestreet +parse-docstrings=true diff --git a/doc/docs/tutorials/provider-explicit/README.md b/doc/docs/tutorials/provider-explicit/README.md index 461bc85..beb3b0e 100644 --- a/doc/docs/tutorials/provider-explicit/README.md +++ b/doc/docs/tutorials/provider-explicit/README.md @@ -366,7 +366,7 @@ And, again, time to instantiate our polymorphic code! 3 ~f:(fun x -> x + 1) |> Higher_kinded_list.project -- : int list = List.(::) (3, [4; 5; 6; 7; 8; 9; 10; 11; 12]) +- : int list = [3; 4; 5; 6; 7; 8; 9; 10; 11; 12] # map_n_times (mappable_array ()) diff --git a/test/mdx/test__magic3.md b/test/mdx/test__magic3.md index 041767a..898c22c 100644 --- a/test/mdx/test__magic3.md +++ b/test/mdx/test__magic3.md @@ -111,7 +111,7 @@ let _ = (Trait.t : (unit, string, [ `A]) Provider.Trait.t) ;; ``` ```mdx-error Line 1, characters 10-17: -Error: This expression has type (unit, unit, 'a) Provider.Trait.t +Error: The value Trait.t has type (unit, unit, 'a) Provider.Trait.t but an expression was expected of type (unit, string, [ `A ]) Provider.Trait.t Type unit is not compatible with type string @@ -133,7 +133,7 @@ let crash () = ``` ```mdx-error Line 2, characters 46-47: -Error: This expression has type (int, int, [ `A ]) Provider.Trait.t +Error: The value b has type (int, int, [ `A ]) Provider.Trait.t but an expression was expected of type (string, 'a, 'b) Provider.Trait.t Type int is not compatible with type string diff --git a/test/test__make.ml b/test/test__make.ml index 34a7dc1..8523f6d 100644 --- a/test/test__make.ml +++ b/test/test__make.ml @@ -1,8 +1,8 @@ (* This test is focused on the "make interface" functionality. We are testing - that different ways to create an interface -- using [make], [extend], [Trait. - implement], or the provider interface supplied maker -- all result in - equivalent interfaces. This ensures consistency across different methods of - interface creation. *) + that different ways to create an interface -- using [make], [extend], + [Trait. implement], or the provider interface supplied maker -- all result + in equivalent interfaces. This ensures consistency across different methods + of interface creation. *) let%expect_test "int-printer" = let printer = Test_providers.Int_printer.make () in