Skip to content

Commit 7a6ce40

Browse files
NathanRebNathanReb
authored
Merge pull request #554 from NathanReb/update-ocamlformat-0-27-0
Update ocamlformat 0.27.0
2 parents 2ea8145 + cee2611 commit 7a6ce40

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+812
-798
lines changed

‎.git-blame-ignore-revs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,6 @@
99

1010
#The commit upgrading to ocamlformat.0.26.1
1111
dab938d3e6f316c20cc141aaff534a0f5f0ab70f
12+
13+
#The commit upgrading to ocamlformat 0.27.0
14+
234aa6510893e6a9e4eb9badc128c075f8fd1c36

‎.ocamlformat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
version=0.26.2
1+
version=0.27.0
22
profile=conventional
33
parse-docstrings=true

‎ast/ast.ml

Lines changed: 307 additions & 302 deletions
Large diffs are not rendered by default.

‎astlib/migrate_402_403.ml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -682,10 +682,10 @@ and copy_extension : From.Parsetree.extension -> To.Parsetree.extension =
682682
(copy_loc (fun x -> x) x0, copy_payload x1)
683683

684684
and copy_class_infos :
685-
'f0 'g0.
686-
('f0 -> 'g0) ->
687-
'f0 From.Parsetree.class_infos ->
688-
'g0 To.Parsetree.class_infos =
685+
'f0 'g0.
686+
('f0 -> 'g0) ->
687+
'f0 From.Parsetree.class_infos ->
688+
'g0 To.Parsetree.class_infos =
689689
fun f0
690690
{
691691
From.Parsetree.pci_virt;
@@ -719,10 +719,10 @@ and copy_include_description :
719719
fun x -> copy_include_infos copy_module_type x
720720

721721
and copy_include_infos :
722-
'f0 'g0.
723-
('f0 -> 'g0) ->
724-
'f0 From.Parsetree.include_infos ->
725-
'g0 To.Parsetree.include_infos =
722+
'f0 'g0.
723+
('f0 -> 'g0) ->
724+
'f0 From.Parsetree.include_infos ->
725+
'g0 To.Parsetree.include_infos =
726726
fun f0
727727
{
728728
From.Parsetree.pincl_mod;
@@ -983,7 +983,7 @@ and copy_option : 'f0 'g0. ('f0 -> 'g0) -> 'f0 option -> 'g0 option =
983983
and copy_longident : Longident.t -> Longident.t = fun x -> x
984984

985985
and copy_loc :
986-
'f0 'g0. ('f0 -> 'g0) -> 'f0 From.Asttypes.loc -> 'g0 To.Asttypes.loc =
986+
'f0 'g0. ('f0 -> 'g0) -> 'f0 From.Asttypes.loc -> 'g0 To.Asttypes.loc =
987987
fun f0 { From.Asttypes.txt; From.Asttypes.loc } ->
988988
{ To.Asttypes.txt = f0 txt; To.Asttypes.loc = copy_location loc }
989989

‎astlib/migrate_403_402.ml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -692,10 +692,10 @@ and copy_extension : From.Parsetree.extension -> To.Parsetree.extension =
692692
(copy_loc (fun x -> x) x0, copy_payload (from_loc x0) x1)
693693

694694
and copy_class_infos :
695-
'f0 'g0.
696-
('f0 -> 'g0) ->
697-
'f0 From.Parsetree.class_infos ->
698-
'g0 To.Parsetree.class_infos =
695+
'f0 'g0.
696+
('f0 -> 'g0) ->
697+
'f0 From.Parsetree.class_infos ->
698+
'g0 To.Parsetree.class_infos =
699699
fun f0
700700
{
701701
From.Parsetree.pci_virt;
@@ -729,10 +729,10 @@ and copy_include_description :
729729
fun x -> copy_include_infos copy_module_type x
730730

731731
and copy_include_infos :
732-
'f0 'g0.
733-
('f0 -> 'g0) ->
734-
'f0 From.Parsetree.include_infos ->
735-
'g0 To.Parsetree.include_infos =
732+
'f0 'g0.
733+
('f0 -> 'g0) ->
734+
'f0 From.Parsetree.include_infos ->
735+
'g0 To.Parsetree.include_infos =
736736
fun f0
737737
{
738738
From.Parsetree.pincl_mod;
@@ -998,7 +998,7 @@ and copy_option : 'f0 'g0. ('f0 -> 'g0) -> 'f0 option -> 'g0 option =
998998
and copy_longident : Longident.t -> Longident.t = fun x -> x
999999

10001000
and copy_loc :
1001-
'f0 'g0. ('f0 -> 'g0) -> 'f0 From.Asttypes.loc -> 'g0 To.Asttypes.loc =
1001+
'f0 'g0. ('f0 -> 'g0) -> 'f0 From.Asttypes.loc -> 'g0 To.Asttypes.loc =
10021002
fun f0 { From.Asttypes.txt; From.Asttypes.loc } ->
10031003
{ To.Asttypes.txt = f0 txt; To.Asttypes.loc = copy_location loc }
10041004

‎astlib/migrate_403_404.ml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -668,10 +668,10 @@ and copy_extension : From.Parsetree.extension -> To.Parsetree.extension =
668668
(copy_loc (fun x -> x) x0, copy_payload x1)
669669

670670
and copy_class_infos :
671-
'f0 'g0.
672-
('f0 -> 'g0) ->
673-
'f0 From.Parsetree.class_infos ->
674-
'g0 To.Parsetree.class_infos =
671+
'f0 'g0.
672+
('f0 -> 'g0) ->
673+
'f0 From.Parsetree.class_infos ->
674+
'g0 To.Parsetree.class_infos =
675675
fun f0
676676
{
677677
From.Parsetree.pci_virt;
@@ -705,10 +705,10 @@ and copy_include_description :
705705
fun x -> copy_include_infos copy_module_type x
706706

707707
and copy_include_infos :
708-
'f0 'g0.
709-
('f0 -> 'g0) ->
710-
'f0 From.Parsetree.include_infos ->
711-
'g0 To.Parsetree.include_infos =
708+
'f0 'g0.
709+
('f0 -> 'g0) ->
710+
'f0 From.Parsetree.include_infos ->
711+
'g0 To.Parsetree.include_infos =
712712
fun f0
713713
{
714714
From.Parsetree.pincl_mod;
@@ -967,7 +967,7 @@ and copy_option : 'f0 'g0. ('f0 -> 'g0) -> 'f0 option -> 'g0 option =
967967
and copy_longident : Longident.t -> Longident.t = fun x -> x
968968

969969
and copy_loc :
970-
'f0 'g0. ('f0 -> 'g0) -> 'f0 From.Asttypes.loc -> 'g0 To.Asttypes.loc =
970+
'f0 'g0. ('f0 -> 'g0) -> 'f0 From.Asttypes.loc -> 'g0 To.Asttypes.loc =
971971
fun f0 { From.Asttypes.txt; From.Asttypes.loc } ->
972972
{ To.Asttypes.txt = f0 txt; To.Asttypes.loc = copy_location loc }
973973

‎astlib/migrate_404_403.ml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -676,10 +676,10 @@ and copy_extension : From.Parsetree.extension -> To.Parsetree.extension =
676676
(copy_loc (fun x -> x) x0, copy_payload x1)
677677

678678
and copy_class_infos :
679-
'f0 'g0.
680-
('f0 -> 'g0) ->
681-
'f0 From.Parsetree.class_infos ->
682-
'g0 To.Parsetree.class_infos =
679+
'f0 'g0.
680+
('f0 -> 'g0) ->
681+
'f0 From.Parsetree.class_infos ->
682+
'g0 To.Parsetree.class_infos =
683683
fun f0
684684
{
685685
From.Parsetree.pci_virt;
@@ -713,10 +713,10 @@ and copy_include_description :
713713
fun x -> copy_include_infos copy_module_type x
714714

715715
and copy_include_infos :
716-
'f0 'g0.
717-
('f0 -> 'g0) ->
718-
'f0 From.Parsetree.include_infos ->
719-
'g0 To.Parsetree.include_infos =
716+
'f0 'g0.
717+
('f0 -> 'g0) ->
718+
'f0 From.Parsetree.include_infos ->
719+
'g0 To.Parsetree.include_infos =
720720
fun f0
721721
{
722722
From.Parsetree.pincl_mod;
@@ -975,7 +975,7 @@ and copy_option : 'f0 'g0. ('f0 -> 'g0) -> 'f0 option -> 'g0 option =
975975
and copy_longident : Longident.t -> Longident.t = fun x -> x
976976

977977
and copy_loc :
978-
'f0 'g0. ('f0 -> 'g0) -> 'f0 From.Asttypes.loc -> 'g0 To.Asttypes.loc =
978+
'f0 'g0. ('f0 -> 'g0) -> 'f0 From.Asttypes.loc -> 'g0 To.Asttypes.loc =
979979
fun f0 { From.Asttypes.txt; From.Asttypes.loc } ->
980980
{ To.Asttypes.txt = f0 txt; To.Asttypes.loc = copy_location loc }
981981

‎astlib/migrate_404_405.ml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -683,10 +683,10 @@ and copy_extension : From.Parsetree.extension -> To.Parsetree.extension =
683683
(copy_loc (fun x -> x) x0, copy_payload x1)
684684

685685
and copy_class_infos :
686-
'f0 'g0.
687-
('f0 -> 'g0) ->
688-
'f0 From.Parsetree.class_infos ->
689-
'g0 To.Parsetree.class_infos =
686+
'f0 'g0.
687+
('f0 -> 'g0) ->
688+
'f0 From.Parsetree.class_infos ->
689+
'g0 To.Parsetree.class_infos =
690690
fun f0
691691
{
692692
From.Parsetree.pci_virt;
@@ -720,10 +720,10 @@ and copy_include_description :
720720
fun x -> copy_include_infos copy_module_type x
721721

722722
and copy_include_infos :
723-
'f0 'g0.
724-
('f0 -> 'g0) ->
725-
'f0 From.Parsetree.include_infos ->
726-
'g0 To.Parsetree.include_infos =
723+
'f0 'g0.
724+
('f0 -> 'g0) ->
725+
'f0 From.Parsetree.include_infos ->
726+
'g0 To.Parsetree.include_infos =
727727
fun f0
728728
{
729729
From.Parsetree.pincl_mod;
@@ -982,7 +982,7 @@ and copy_option : 'f0 'g0. ('f0 -> 'g0) -> 'f0 option -> 'g0 option =
982982
and copy_longident : Longident.t -> Longident.t = fun x -> x
983983

984984
and copy_loc :
985-
'f0 'g0. ('f0 -> 'g0) -> 'f0 From.Asttypes.loc -> 'g0 To.Asttypes.loc =
985+
'f0 'g0. ('f0 -> 'g0) -> 'f0 From.Asttypes.loc -> 'g0 To.Asttypes.loc =
986986
fun f0 { From.Asttypes.txt; From.Asttypes.loc } ->
987987
{ To.Asttypes.txt = f0 txt; To.Asttypes.loc = copy_location loc }
988988

‎astlib/migrate_405_404.ml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -682,10 +682,10 @@ and copy_extension : From.Parsetree.extension -> To.Parsetree.extension =
682682
(copy_loc (fun x -> x) x0, copy_payload x1)
683683

684684
and copy_class_infos :
685-
'f0 'g0.
686-
('f0 -> 'g0) ->
687-
'f0 From.Parsetree.class_infos ->
688-
'g0 To.Parsetree.class_infos =
685+
'f0 'g0.
686+
('f0 -> 'g0) ->
687+
'f0 From.Parsetree.class_infos ->
688+
'g0 To.Parsetree.class_infos =
689689
fun f0
690690
{
691691
From.Parsetree.pci_virt;
@@ -719,10 +719,10 @@ and copy_include_description :
719719
fun x -> copy_include_infos copy_module_type x
720720

721721
and copy_include_infos :
722-
'f0 'g0.
723-
('f0 -> 'g0) ->
724-
'f0 From.Parsetree.include_infos ->
725-
'g0 To.Parsetree.include_infos =
722+
'f0 'g0.
723+
('f0 -> 'g0) ->
724+
'f0 From.Parsetree.include_infos ->
725+
'g0 To.Parsetree.include_infos =
726726
fun f0
727727
{
728728
From.Parsetree.pincl_mod;
@@ -981,7 +981,7 @@ and copy_option : 'f0 'g0. ('f0 -> 'g0) -> 'f0 option -> 'g0 option =
981981
and copy_longident : Longident.t -> Longident.t = fun x -> x
982982

983983
and copy_loc :
984-
'f0 'g0. ('f0 -> 'g0) -> 'f0 From.Asttypes.loc -> 'g0 To.Asttypes.loc =
984+
'f0 'g0. ('f0 -> 'g0) -> 'f0 From.Asttypes.loc -> 'g0 To.Asttypes.loc =
985985
fun f0 { From.Asttypes.txt; From.Asttypes.loc } ->
986986
{ To.Asttypes.txt = f0 txt; To.Asttypes.loc = copy_location loc }
987987

‎astlib/migrate_405_406.ml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -685,10 +685,10 @@ and copy_extension : From.Parsetree.extension -> To.Parsetree.extension =
685685
(copy_loc (fun x -> x) x0, copy_payload x1)
686686

687687
and copy_class_infos :
688-
'f0 'g0.
689-
('f0 -> 'g0) ->
690-
'f0 From.Parsetree.class_infos ->
691-
'g0 To.Parsetree.class_infos =
688+
'f0 'g0.
689+
('f0 -> 'g0) ->
690+
'f0 From.Parsetree.class_infos ->
691+
'g0 To.Parsetree.class_infos =
692692
fun f0
693693
{
694694
From.Parsetree.pci_virt;
@@ -722,10 +722,10 @@ and copy_include_description :
722722
fun x -> copy_include_infos copy_module_type x
723723

724724
and copy_include_infos :
725-
'f0 'g0.
726-
('f0 -> 'g0) ->
727-
'f0 From.Parsetree.include_infos ->
728-
'g0 To.Parsetree.include_infos =
725+
'f0 'g0.
726+
('f0 -> 'g0) ->
727+
'f0 From.Parsetree.include_infos ->
728+
'g0 To.Parsetree.include_infos =
729729
fun f0
730730
{
731731
From.Parsetree.pincl_mod;
@@ -984,7 +984,7 @@ and copy_option : 'f0 'g0. ('f0 -> 'g0) -> 'f0 option -> 'g0 option =
984984
and copy_longident : Longident.t -> Longident.t = fun x -> x
985985

986986
and copy_loc :
987-
'f0 'g0. ('f0 -> 'g0) -> 'f0 From.Asttypes.loc -> 'g0 To.Asttypes.loc =
987+
'f0 'g0. ('f0 -> 'g0) -> 'f0 From.Asttypes.loc -> 'g0 To.Asttypes.loc =
988988
fun f0 { From.Asttypes.txt; From.Asttypes.loc } ->
989989
{ To.Asttypes.txt = f0 txt; To.Asttypes.loc = copy_location loc }
990990

‎astlib/migrate_406_405.ml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -697,10 +697,10 @@ and copy_extension : From.Parsetree.extension -> To.Parsetree.extension =
697697
(copy_loc (fun x -> x) x0, copy_payload x1)
698698

699699
and copy_class_infos :
700-
'f0 'g0.
701-
('f0 -> 'g0) ->
702-
'f0 From.Parsetree.class_infos ->
703-
'g0 To.Parsetree.class_infos =
700+
'f0 'g0.
701+
('f0 -> 'g0) ->
702+
'f0 From.Parsetree.class_infos ->
703+
'g0 To.Parsetree.class_infos =
704704
fun f0
705705
{
706706
From.Parsetree.pci_virt;
@@ -734,10 +734,10 @@ and copy_include_description :
734734
fun x -> copy_include_infos copy_module_type x
735735

736736
and copy_include_infos :
737-
'f0 'g0.
738-
('f0 -> 'g0) ->
739-
'f0 From.Parsetree.include_infos ->
740-
'g0 To.Parsetree.include_infos =
737+
'f0 'g0.
738+
('f0 -> 'g0) ->
739+
'f0 From.Parsetree.include_infos ->
740+
'g0 To.Parsetree.include_infos =
741741
fun f0
742742
{
743743
From.Parsetree.pincl_mod;
@@ -996,7 +996,7 @@ and copy_option : 'f0 'g0. ('f0 -> 'g0) -> 'f0 option -> 'g0 option =
996996
and copy_longident : Longident.t -> Longident.t = fun x -> x
997997

998998
and copy_loc :
999-
'f0 'g0. ('f0 -> 'g0) -> 'f0 From.Asttypes.loc -> 'g0 To.Asttypes.loc =
999+
'f0 'g0. ('f0 -> 'g0) -> 'f0 From.Asttypes.loc -> 'g0 To.Asttypes.loc =
10001000
fun f0 { From.Asttypes.txt; From.Asttypes.loc } ->
10011001
{ To.Asttypes.txt = f0 txt; To.Asttypes.loc = copy_location loc }
10021002

‎astlib/migrate_406_407.ml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -693,10 +693,10 @@ and copy_extension : From.Parsetree.extension -> To.Parsetree.extension =
693693
(copy_loc (fun x -> x) x0, copy_payload x1)
694694

695695
and copy_class_infos :
696-
'f0 'g0.
697-
('f0 -> 'g0) ->
698-
'f0 From.Parsetree.class_infos ->
699-
'g0 To.Parsetree.class_infos =
696+
'f0 'g0.
697+
('f0 -> 'g0) ->
698+
'f0 From.Parsetree.class_infos ->
699+
'g0 To.Parsetree.class_infos =
700700
fun f0
701701
{
702702
From.Parsetree.pci_virt;
@@ -730,10 +730,10 @@ and copy_include_description :
730730
fun x -> copy_include_infos copy_module_type x
731731

732732
and copy_include_infos :
733-
'f0 'g0.
734-
('f0 -> 'g0) ->
735-
'f0 From.Parsetree.include_infos ->
736-
'g0 To.Parsetree.include_infos =
733+
'f0 'g0.
734+
('f0 -> 'g0) ->
735+
'f0 From.Parsetree.include_infos ->
736+
'g0 To.Parsetree.include_infos =
737737
fun f0
738738
{
739739
From.Parsetree.pincl_mod;
@@ -992,7 +992,7 @@ and copy_option : 'f0 'g0. ('f0 -> 'g0) -> 'f0 option -> 'g0 option =
992992
and copy_longident : Longident.t -> Longident.t = fun x -> x
993993

994994
and copy_loc :
995-
'f0 'g0. ('f0 -> 'g0) -> 'f0 From.Asttypes.loc -> 'g0 To.Asttypes.loc =
995+
'f0 'g0. ('f0 -> 'g0) -> 'f0 From.Asttypes.loc -> 'g0 To.Asttypes.loc =
996996
fun f0 { From.Asttypes.txt; From.Asttypes.loc } ->
997997
{ To.Asttypes.txt = f0 txt; To.Asttypes.loc = copy_location loc }
998998

0 commit comments

Comments
 (0)