Merge pull request #554 from NathanReb/update-ocamlformat-0-27-0

Update ocamlformat 0.27.0
ocaml-ppx · Jan 14, 2025 · 7a6ce40 · 7a6ce40
2 parents 2ea8145 + cee2611
commit 7a6ce40
Show file tree

Hide file tree

Showing 55 changed files with 812 additions and 798 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -9,3 +9,6 @@
 
 #The commit upgrading to ocamlformat.0.26.1
 dab938d3e6f316c20cc141aaff534a0f5f0ab70f
+
+#The commit upgrading to ocamlformat 0.27.0
+234aa6510893e6a9e4eb9badc128c075f8fd1c36
diff --git a/.ocamlformat b/.ocamlformat
@@ -1,3 +1,3 @@
-version=0.26.2
+version=0.27.0
 profile=conventional
 parse-docstrings=true
diff --git a/ast/ast.ml b/ast/ast.ml
diff --git a/astlib/migrate_402_403.ml b/astlib/migrate_402_403.ml
@@ -682,10 +682,10 @@ and copy_extension : From.Parsetree.extension -> To.Parsetree.extension =
   (copy_loc (fun x -> x) x0, copy_payload x1)
 
 and copy_class_infos :
-      'f0 'g0.
-      ('f0 -> 'g0) ->
-      'f0 From.Parsetree.class_infos ->
-      'g0 To.Parsetree.class_infos =
+    'f0 'g0.
+    ('f0 -> 'g0) ->
+    'f0 From.Parsetree.class_infos ->
+    'g0 To.Parsetree.class_infos =
  fun f0
      {
        From.Parsetree.pci_virt;
@@ -719,10 +719,10 @@ and copy_include_description :
  fun x -> copy_include_infos copy_module_type x
 
 and copy_include_infos :
-      'f0 'g0.
-      ('f0 -> 'g0) ->
-      'f0 From.Parsetree.include_infos ->
-      'g0 To.Parsetree.include_infos =
+    'f0 'g0.
+    ('f0 -> 'g0) ->
+    'f0 From.Parsetree.include_infos ->
+    'g0 To.Parsetree.include_infos =
  fun f0
      {
        From.Parsetree.pincl_mod;
@@ -983,7 +983,7 @@ and copy_option : 'f0 'g0. ('f0 -> 'g0) -> 'f0 option -> 'g0 option =
 and copy_longident : Longident.t -> Longident.t = fun x -> x
 
 and copy_loc :
-      'f0 'g0. ('f0 -> 'g0) -> 'f0 From.Asttypes.loc -> 'g0 To.Asttypes.loc =
+    'f0 'g0. ('f0 -> 'g0) -> 'f0 From.Asttypes.loc -> 'g0 To.Asttypes.loc =
  fun f0 { From.Asttypes.txt; From.Asttypes.loc } ->
   { To.Asttypes.txt = f0 txt; To.Asttypes.loc = copy_location loc }
 

diff --git a/astlib/migrate_403_402.ml b/astlib/migrate_403_402.ml
@@ -692,10 +692,10 @@ and copy_extension : From.Parsetree.extension -> To.Parsetree.extension =
   (copy_loc (fun x -> x) x0, copy_payload (from_loc x0) x1)
 
 and copy_class_infos :
-      'f0 'g0.
-      ('f0 -> 'g0) ->
-      'f0 From.Parsetree.class_infos ->
-      'g0 To.Parsetree.class_infos =
+    'f0 'g0.
+    ('f0 -> 'g0) ->
+    'f0 From.Parsetree.class_infos ->
+    'g0 To.Parsetree.class_infos =
  fun f0
      {
        From.Parsetree.pci_virt;
@@ -729,10 +729,10 @@ and copy_include_description :
  fun x -> copy_include_infos copy_module_type x
 
 and copy_include_infos :
-      'f0 'g0.
-      ('f0 -> 'g0) ->
-      'f0 From.Parsetree.include_infos ->
-      'g0 To.Parsetree.include_infos =
+    'f0 'g0.
+    ('f0 -> 'g0) ->
+    'f0 From.Parsetree.include_infos ->
+    'g0 To.Parsetree.include_infos =
  fun f0
      {
        From.Parsetree.pincl_mod;
@@ -998,7 +998,7 @@ and copy_option : 'f0 'g0. ('f0 -> 'g0) -> 'f0 option -> 'g0 option =
 and copy_longident : Longident.t -> Longident.t = fun x -> x
 
 and copy_loc :
-      'f0 'g0. ('f0 -> 'g0) -> 'f0 From.Asttypes.loc -> 'g0 To.Asttypes.loc =
+    'f0 'g0. ('f0 -> 'g0) -> 'f0 From.Asttypes.loc -> 'g0 To.Asttypes.loc =
  fun f0 { From.Asttypes.txt; From.Asttypes.loc } ->
   { To.Asttypes.txt = f0 txt; To.Asttypes.loc = copy_location loc }
 

diff --git a/astlib/migrate_403_404.ml b/astlib/migrate_403_404.ml
@@ -668,10 +668,10 @@ and copy_extension : From.Parsetree.extension -> To.Parsetree.extension =
   (copy_loc (fun x -> x) x0, copy_payload x1)
 
 and copy_class_infos :
-      'f0 'g0.
-      ('f0 -> 'g0) ->
-      'f0 From.Parsetree.class_infos ->
-      'g0 To.Parsetree.class_infos =
+    'f0 'g0.
+    ('f0 -> 'g0) ->
+    'f0 From.Parsetree.class_infos ->
+    'g0 To.Parsetree.class_infos =
  fun f0
      {
        From.Parsetree.pci_virt;
@@ -705,10 +705,10 @@ and copy_include_description :
  fun x -> copy_include_infos copy_module_type x
 
 and copy_include_infos :
-      'f0 'g0.
-      ('f0 -> 'g0) ->
-      'f0 From.Parsetree.include_infos ->
-      'g0 To.Parsetree.include_infos =
+    'f0 'g0.
+    ('f0 -> 'g0) ->
+    'f0 From.Parsetree.include_infos ->
+    'g0 To.Parsetree.include_infos =
  fun f0
      {
        From.Parsetree.pincl_mod;
@@ -967,7 +967,7 @@ and copy_option : 'f0 'g0. ('f0 -> 'g0) -> 'f0 option -> 'g0 option =
 and copy_longident : Longident.t -> Longident.t = fun x -> x
 
 and copy_loc :
-      'f0 'g0. ('f0 -> 'g0) -> 'f0 From.Asttypes.loc -> 'g0 To.Asttypes.loc =
+    'f0 'g0. ('f0 -> 'g0) -> 'f0 From.Asttypes.loc -> 'g0 To.Asttypes.loc =
  fun f0 { From.Asttypes.txt; From.Asttypes.loc } ->
   { To.Asttypes.txt = f0 txt; To.Asttypes.loc = copy_location loc }
 

diff --git a/astlib/migrate_404_403.ml b/astlib/migrate_404_403.ml
@@ -676,10 +676,10 @@ and copy_extension : From.Parsetree.extension -> To.Parsetree.extension =
   (copy_loc (fun x -> x) x0, copy_payload x1)
 
 and copy_class_infos :
-      'f0 'g0.
-      ('f0 -> 'g0) ->
-      'f0 From.Parsetree.class_infos ->
-      'g0 To.Parsetree.class_infos =
+    'f0 'g0.
+    ('f0 -> 'g0) ->
+    'f0 From.Parsetree.class_infos ->
+    'g0 To.Parsetree.class_infos =
  fun f0
      {
        From.Parsetree.pci_virt;
@@ -713,10 +713,10 @@ and copy_include_description :
  fun x -> copy_include_infos copy_module_type x
 
 and copy_include_infos :
-      'f0 'g0.
-      ('f0 -> 'g0) ->
-      'f0 From.Parsetree.include_infos ->
-      'g0 To.Parsetree.include_infos =
+    'f0 'g0.
+    ('f0 -> 'g0) ->
+    'f0 From.Parsetree.include_infos ->
+    'g0 To.Parsetree.include_infos =
  fun f0
      {
        From.Parsetree.pincl_mod;
@@ -975,7 +975,7 @@ and copy_option : 'f0 'g0. ('f0 -> 'g0) -> 'f0 option -> 'g0 option =
 and copy_longident : Longident.t -> Longident.t = fun x -> x
 
 and copy_loc :
-      'f0 'g0. ('f0 -> 'g0) -> 'f0 From.Asttypes.loc -> 'g0 To.Asttypes.loc =
+    'f0 'g0. ('f0 -> 'g0) -> 'f0 From.Asttypes.loc -> 'g0 To.Asttypes.loc =
  fun f0 { From.Asttypes.txt; From.Asttypes.loc } ->
   { To.Asttypes.txt = f0 txt; To.Asttypes.loc = copy_location loc }
 

diff --git a/astlib/migrate_404_405.ml b/astlib/migrate_404_405.ml
@@ -683,10 +683,10 @@ and copy_extension : From.Parsetree.extension -> To.Parsetree.extension =
   (copy_loc (fun x -> x) x0, copy_payload x1)
 
 and copy_class_infos :
-      'f0 'g0.
-      ('f0 -> 'g0) ->
-      'f0 From.Parsetree.class_infos ->
-      'g0 To.Parsetree.class_infos =
+    'f0 'g0.
+    ('f0 -> 'g0) ->
+    'f0 From.Parsetree.class_infos ->
+    'g0 To.Parsetree.class_infos =
  fun f0
      {
        From.Parsetree.pci_virt;
@@ -720,10 +720,10 @@ and copy_include_description :
  fun x -> copy_include_infos copy_module_type x
 
 and copy_include_infos :
-      'f0 'g0.
-      ('f0 -> 'g0) ->
-      'f0 From.Parsetree.include_infos ->
-      'g0 To.Parsetree.include_infos =
+    'f0 'g0.
+    ('f0 -> 'g0) ->
+    'f0 From.Parsetree.include_infos ->
+    'g0 To.Parsetree.include_infos =
  fun f0
      {
        From.Parsetree.pincl_mod;
@@ -982,7 +982,7 @@ and copy_option : 'f0 'g0. ('f0 -> 'g0) -> 'f0 option -> 'g0 option =
 and copy_longident : Longident.t -> Longident.t = fun x -> x
 
 and copy_loc :
-      'f0 'g0. ('f0 -> 'g0) -> 'f0 From.Asttypes.loc -> 'g0 To.Asttypes.loc =
+    'f0 'g0. ('f0 -> 'g0) -> 'f0 From.Asttypes.loc -> 'g0 To.Asttypes.loc =
  fun f0 { From.Asttypes.txt; From.Asttypes.loc } ->
   { To.Asttypes.txt = f0 txt; To.Asttypes.loc = copy_location loc }
 

diff --git a/astlib/migrate_405_404.ml b/astlib/migrate_405_404.ml
@@ -682,10 +682,10 @@ and copy_extension : From.Parsetree.extension -> To.Parsetree.extension =
   (copy_loc (fun x -> x) x0, copy_payload x1)
 
 and copy_class_infos :
-      'f0 'g0.
-      ('f0 -> 'g0) ->
-      'f0 From.Parsetree.class_infos ->
-      'g0 To.Parsetree.class_infos =
+    'f0 'g0.
+    ('f0 -> 'g0) ->
+    'f0 From.Parsetree.class_infos ->
+    'g0 To.Parsetree.class_infos =
  fun f0
      {
        From.Parsetree.pci_virt;
@@ -719,10 +719,10 @@ and copy_include_description :
  fun x -> copy_include_infos copy_module_type x
 
 and copy_include_infos :
-      'f0 'g0.
-      ('f0 -> 'g0) ->
-      'f0 From.Parsetree.include_infos ->
-      'g0 To.Parsetree.include_infos =
+    'f0 'g0.
+    ('f0 -> 'g0) ->
+    'f0 From.Parsetree.include_infos ->
+    'g0 To.Parsetree.include_infos =
  fun f0
      {
        From.Parsetree.pincl_mod;
@@ -981,7 +981,7 @@ and copy_option : 'f0 'g0. ('f0 -> 'g0) -> 'f0 option -> 'g0 option =
 and copy_longident : Longident.t -> Longident.t = fun x -> x
 
 and copy_loc :
-      'f0 'g0. ('f0 -> 'g0) -> 'f0 From.Asttypes.loc -> 'g0 To.Asttypes.loc =
+    'f0 'g0. ('f0 -> 'g0) -> 'f0 From.Asttypes.loc -> 'g0 To.Asttypes.loc =
  fun f0 { From.Asttypes.txt; From.Asttypes.loc } ->
   { To.Asttypes.txt = f0 txt; To.Asttypes.loc = copy_location loc }
 

diff --git a/astlib/migrate_405_406.ml b/astlib/migrate_405_406.ml
@@ -685,10 +685,10 @@ and copy_extension : From.Parsetree.extension -> To.Parsetree.extension =
   (copy_loc (fun x -> x) x0, copy_payload x1)
 
 and copy_class_infos :
-      'f0 'g0.
-      ('f0 -> 'g0) ->
-      'f0 From.Parsetree.class_infos ->
-      'g0 To.Parsetree.class_infos =
+    'f0 'g0.
+    ('f0 -> 'g0) ->
+    'f0 From.Parsetree.class_infos ->
+    'g0 To.Parsetree.class_infos =
  fun f0
      {
        From.Parsetree.pci_virt;
@@ -722,10 +722,10 @@ and copy_include_description :
  fun x -> copy_include_infos copy_module_type x
 
 and copy_include_infos :
-      'f0 'g0.
-      ('f0 -> 'g0) ->
-      'f0 From.Parsetree.include_infos ->
-      'g0 To.Parsetree.include_infos =
+    'f0 'g0.
+    ('f0 -> 'g0) ->
+    'f0 From.Parsetree.include_infos ->
+    'g0 To.Parsetree.include_infos =
  fun f0
      {
        From.Parsetree.pincl_mod;
@@ -984,7 +984,7 @@ and copy_option : 'f0 'g0. ('f0 -> 'g0) -> 'f0 option -> 'g0 option =
 and copy_longident : Longident.t -> Longident.t = fun x -> x
 
 and copy_loc :
-      'f0 'g0. ('f0 -> 'g0) -> 'f0 From.Asttypes.loc -> 'g0 To.Asttypes.loc =
+    'f0 'g0. ('f0 -> 'g0) -> 'f0 From.Asttypes.loc -> 'g0 To.Asttypes.loc =
  fun f0 { From.Asttypes.txt; From.Asttypes.loc } ->
   { To.Asttypes.txt = f0 txt; To.Asttypes.loc = copy_location loc }
 

diff --git a/astlib/migrate_406_405.ml b/astlib/migrate_406_405.ml
@@ -697,10 +697,10 @@ and copy_extension : From.Parsetree.extension -> To.Parsetree.extension =
   (copy_loc (fun x -> x) x0, copy_payload x1)
 
 and copy_class_infos :
-      'f0 'g0.
-      ('f0 -> 'g0) ->
-      'f0 From.Parsetree.class_infos ->
-      'g0 To.Parsetree.class_infos =
+    'f0 'g0.
+    ('f0 -> 'g0) ->
+    'f0 From.Parsetree.class_infos ->
+    'g0 To.Parsetree.class_infos =
  fun f0
      {
        From.Parsetree.pci_virt;
@@ -734,10 +734,10 @@ and copy_include_description :
  fun x -> copy_include_infos copy_module_type x
 
 and copy_include_infos :
-      'f0 'g0.
-      ('f0 -> 'g0) ->
-      'f0 From.Parsetree.include_infos ->
-      'g0 To.Parsetree.include_infos =
+    'f0 'g0.
+    ('f0 -> 'g0) ->
+    'f0 From.Parsetree.include_infos ->
+    'g0 To.Parsetree.include_infos =
  fun f0
      {
        From.Parsetree.pincl_mod;
@@ -996,7 +996,7 @@ and copy_option : 'f0 'g0. ('f0 -> 'g0) -> 'f0 option -> 'g0 option =
 and copy_longident : Longident.t -> Longident.t = fun x -> x
 
 and copy_loc :
-      'f0 'g0. ('f0 -> 'g0) -> 'f0 From.Asttypes.loc -> 'g0 To.Asttypes.loc =
+    'f0 'g0. ('f0 -> 'g0) -> 'f0 From.Asttypes.loc -> 'g0 To.Asttypes.loc =
  fun f0 { From.Asttypes.txt; From.Asttypes.loc } ->
   { To.Asttypes.txt = f0 txt; To.Asttypes.loc = copy_location loc }
 

diff --git a/astlib/migrate_406_407.ml b/astlib/migrate_406_407.ml
@@ -693,10 +693,10 @@ and copy_extension : From.Parsetree.extension -> To.Parsetree.extension =
   (copy_loc (fun x -> x) x0, copy_payload x1)
 
 and copy_class_infos :
-      'f0 'g0.
-      ('f0 -> 'g0) ->
-      'f0 From.Parsetree.class_infos ->
-      'g0 To.Parsetree.class_infos =
+    'f0 'g0.
+    ('f0 -> 'g0) ->
+    'f0 From.Parsetree.class_infos ->
+    'g0 To.Parsetree.class_infos =
  fun f0
      {
        From.Parsetree.pci_virt;
@@ -730,10 +730,10 @@ and copy_include_description :
  fun x -> copy_include_infos copy_module_type x
 
 and copy_include_infos :
-      'f0 'g0.
-      ('f0 -> 'g0) ->
-      'f0 From.Parsetree.include_infos ->
-      'g0 To.Parsetree.include_infos =
+    'f0 'g0.
+    ('f0 -> 'g0) ->
+    'f0 From.Parsetree.include_infos ->
+    'g0 To.Parsetree.include_infos =
  fun f0
      {
        From.Parsetree.pincl_mod;
@@ -992,7 +992,7 @@ and copy_option : 'f0 'g0. ('f0 -> 'g0) -> 'f0 option -> 'g0 option =
 and copy_longident : Longident.t -> Longident.t = fun x -> x
 
 and copy_loc :
-      'f0 'g0. ('f0 -> 'g0) -> 'f0 From.Asttypes.loc -> 'g0 To.Asttypes.loc =
+    'f0 'g0. ('f0 -> 'g0) -> 'f0 From.Asttypes.loc -> 'g0 To.Asttypes.loc =
  fun f0 { From.Asttypes.txt; From.Asttypes.loc } ->
   { To.Asttypes.txt = f0 txt; To.Asttypes.loc = copy_location loc }