Skip to content

Commit 609e9bf

Browse files
authored
Merge pull request #39 from mbarbin/upgrade-to-ocaml.5.3.0
Upgrade to ocaml.5.3.0
2 parents 78df016 + 49f048d commit 609e9bf

File tree

6 files changed

+12
-9
lines changed

6 files changed

+12
-9
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
os:
1717
- ubuntu-latest
1818
ocaml-compiler:
19-
- 5.2.x
19+
- 5.3.x
2020

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

.github/workflows/more-ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,13 @@ jobs:
2929
- ubuntu-latest
3030
- windows-latest
3131
ocaml-compiler:
32+
- 5.3.x
3233
- 5.2.x
3334
- 4.14.x
3435
exclude:
3536
# We exclude the combination already tested in the 'ci' workflow.
3637
- os: ubuntu-latest
37-
ocaml-compiler: 5.2.x
38+
ocaml-compiler: 5.3.x
3839
# We exclude windows-4.14 - this fails when building core.
3940
- os: windows-latest
4041
ocaml-compiler: 4.14.x

.ocamlformat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
version=0.27.0
2+
ocaml-version=4.14
23
profile=janestreet
4+
parse-docstrings=true

doc/docs/tutorials/provider-explicit/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ And, again, time to instantiate our polymorphic code!
366366
3
367367
~f:(fun x -> x + 1)
368368
|> Higher_kinded_list.project
369-
- : int list = List.(::) (3, [4; 5; 6; 7; 8; 9; 10; 11; 12])
369+
- : int list = [3; 4; 5; 6; 7; 8; 9; 10; 11; 12]
370370
371371
# map_n_times
372372
(mappable_array ())

test/mdx/test__magic3.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ let _ = (Trait.t : (unit, string, [ `A]) Provider.Trait.t) ;;
111111
```
112112
```mdx-error
113113
Line 1, characters 10-17:
114-
Error: This expression has type (unit, unit, 'a) Provider.Trait.t
114+
Error: The value Trait.t has type (unit, unit, 'a) Provider.Trait.t
115115
but an expression was expected of type
116116
(unit, string, [ `A ]) Provider.Trait.t
117117
Type unit is not compatible with type string
@@ -133,7 +133,7 @@ let crash () =
133133
```
134134
```mdx-error
135135
Line 2, characters 46-47:
136-
Error: This expression has type (int, int, [ `A ]) Provider.Trait.t
136+
Error: The value b has type (int, int, [ `A ]) Provider.Trait.t
137137
but an expression was expected of type
138138
(string, 'a, 'b) Provider.Trait.t
139139
Type int is not compatible with type string

test/test__make.ml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
(* This test is focused on the "make interface" functionality. We are testing
2-
that different ways to create an interface -- using [make], [extend], [Trait.
3-
implement], or the provider interface supplied maker -- all result in
4-
equivalent interfaces. This ensures consistency across different methods of
5-
interface creation. *)
2+
that different ways to create an interface -- using [make], [extend],
3+
[Trait. implement], or the provider interface supplied maker -- all result
4+
in equivalent interfaces. This ensures consistency across different methods
5+
of interface creation. *)
66

77
let%expect_test "int-printer" =
88
let printer = Test_providers.Int_printer.make () in

0 commit comments

Comments
 (0)