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.

Sign up for GitHub

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

Jump to bottom

Preview ocamlformat 0.27.0 preview1 #534

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Preview ocamlformat 0.27.0 preview1 #534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a6b0b9
Preview: Upgrade to OCamlformat 0.27.0-preview1 (unreleased)
Julow Oct 30, 2024
bc6ce1e
Update .git-blame-ignore-revs
Julow Oct 30, 2024
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: 2 additions & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@

#The commit upgrading to ocamlformat.0.26.1
dab938d3e6f316c20cc141aaff534a0f5f0ab70f
# Upgrade to OCamlformat 0.27.0-preview1
4a6b0b945c7fd4cf83f82df4b3b36fe22d8b8ec0
2 changes: 1 addition & 1 deletion .ocamlformat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version=0.26.2
version=0.27.0-preview1
profile=conventional
parse-docstrings=true
467 changes: 236 additions & 231 deletions ast/ast.ml
View file
Open in desktop

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions astlib/migrate_402_403.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 }

Expand Down
18 changes: 9 additions & 9 deletions astlib/migrate_403_402.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 }

Expand Down
18 changes: 9 additions & 9 deletions astlib/migrate_403_404.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 }

Expand Down
18 changes: 9 additions & 9 deletions astlib/migrate_404_403.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 }

Expand Down
18 changes: 9 additions & 9 deletions astlib/migrate_404_405.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 }

Expand Down
18 changes: 9 additions & 9 deletions astlib/migrate_405_404.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 }

Expand Down
18 changes: 9 additions & 9 deletions astlib/migrate_405_406.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 }

Expand Down
18 changes: 9 additions & 9 deletions astlib/migrate_406_405.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 }

Expand Down
18 changes: 9 additions & 9 deletions astlib/migrate_406_407.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 }

Expand Down
Loading
Loading