Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to ocaml.5.3.0 #39

Merged
merged 5 commits into from
Jan 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
os:
- ubuntu-latest
ocaml-compiler:
- 5.2.x
- 5.3.x

runs-on: ${{ matrix.os }}

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/more-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions .ocamlformat
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
version=0.27.0
ocaml-version=4.14
profile=janestreet
parse-docstrings=true
2 changes: 1 addition & 1 deletion doc/docs/tutorials/provider-explicit/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 ())
Expand Down
4 changes: 2 additions & 2 deletions test/mdx/test__magic3.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions test/test__make.ml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading