diff --git a/lib/Conf.ml b/lib/Conf.ml index 182eb8b7d0..40c3309555 100644 --- a/lib/Conf.ml +++ b/lib/Conf.ml @@ -266,7 +266,7 @@ let default = ; disable= elt false ; margin_check= elt false ; max_iters= elt 10 - ; ocaml_version= elt Ocaml_version.Releases.v4_04_0 + ; ocaml_version= elt Ocaml_version.Releases.v5_4_0 ; quiet= elt false ; disable_conf_attrs= elt false ; version_check= elt true } } diff --git a/test/cli/print_config.t b/test/cli/print_config.t index 69f3eda1ee..46cb289268 100644 --- a/test/cli/print_config.t +++ b/test/cli/print_config.t @@ -18,7 +18,7 @@ No redundant values: disable=false margin-check=false max-iters=10 - ocaml-version=4.04.0 + ocaml-version=5.4.0 quiet=false disable-conf-attrs=false version-check=true @@ -99,7 +99,7 @@ Redundant values from the conventional profile: disable=false margin-check=false max-iters=10 - ocaml-version=4.04.0 + ocaml-version=5.4.0 quiet=false disable-conf-attrs=false version-check=true @@ -180,7 +180,7 @@ Redundant values from the ocamlformat profile: disable=false margin-check=false max-iters=10 - ocaml-version=4.04.0 + ocaml-version=5.4.0 quiet=false disable-conf-attrs=false version-check=true diff --git a/test/passing/gen/dune.inc b/test/passing/gen/dune.inc index e9a116610c..de7d17f937 100644 --- a/test/passing/gen/dune.inc +++ b/test/passing/gen/dune.inc @@ -1736,7 +1736,7 @@ (action (with-stdout-to effects.ml.stdout (with-stderr-to effects.ml.stderr - (run %{bin:ocamlformat} --name effects.ml --margin-check --ocaml-version=5.3 %{dep:../tests/effects.ml}))))) + (run %{bin:ocamlformat} --name effects.ml --margin-check %{dep:../tests/effects.ml}))))) (rule (alias runtest) diff --git a/test/passing/refs.default/extensions-indent.ml.ref b/test/passing/refs.default/extensions-indent.ml.ref index 8e00d64672..8003690bad 100644 --- a/test/passing/refs.default/extensions-indent.ml.ref +++ b/test/passing/refs.default/extensions-indent.ml.ref @@ -323,9 +323,9 @@ let _ = let _ = f - (object%ext - method x = y - end) + object%ext + method x = y + end let _ = f diff --git a/test/passing/refs.default/extensions.ml.ref b/test/passing/refs.default/extensions.ml.ref index 5a7c1c4ed8..d30a275628 100644 --- a/test/passing/refs.default/extensions.ml.ref +++ b/test/passing/refs.default/extensions.ml.ref @@ -323,9 +323,9 @@ let _ = let _ = f - (object%ext - method x = y - end) + object%ext + method x = y + end let _ = f diff --git a/test/passing/refs.default/labelled_args.ml.ref b/test/passing/refs.default/labelled_args.ml.ref index d2d69848ba..be83b8c1ed 100644 --- a/test/passing/refs.default/labelled_args.ml.ref +++ b/test/passing/refs.default/labelled_args.ml.ref @@ -1,6 +1,6 @@ let _ = let f ~y = y + 1 in - f ~y:(y : int) + f ~(y : int) let () = very_long_function_name diff --git a/test/passing/refs.default/let_punning.ml.ref b/test/passing/refs.default/let_punning.ml.ref index 061a76aa8e..2458e47565 100644 --- a/test/passing/refs.default/let_punning.ml.ref +++ b/test/passing/refs.default/let_punning.ml.ref @@ -6,25 +6,23 @@ and y = 2 and z = 3 let p = - let* x = x and* y = y and* z = z in + let* x = x and* y and* z = z in (x, y, z) let q = - let%foo x = x and y = y and z = z in + let%foo x and y = y and z in (x, y, z) let r = let* (* 1 *) x (* 2 *) = (* 3 *) x (* 4 *) - and* (* 5 *) y = - y + and* (* 5 *) y (* 6 *) in (x, y) let s = let%foo (* 1 *) x (* 2 *) = (* 3 *) x (* 4 *) - and (* 5 *) y = - y + and (* 5 *) y (* 6 *) in (x, y) diff --git a/test/passing/refs.default/object.ml.ref b/test/passing/refs.default/object.ml.ref index 69776edddf..57bd8e2a0b 100644 --- a/test/passing/refs.default/object.ml.ref +++ b/test/passing/refs.default/object.ml.ref @@ -56,8 +56,8 @@ type t = (int, int) #q let _ = object%js end let _ = object%js (super) end let _ = object%js (super : 'a) end -let _ = f (object end) -let _ = f (object%js end) +let _ = f object end +let _ = f object%js end class t ~a = object diff --git a/test/passing/refs.default/object_expr.ml.ref b/test/passing/refs.default/object_expr.ml.ref index fbeb17c61a..c6a9ba6235 100644 --- a/test/passing/refs.default/object_expr.ml.ref +++ b/test/passing/refs.default/object_expr.ml.ref @@ -1,19 +1,19 @@ -(object - method one = 1 -end) +object + method one = 1 +end #one ;; Some - (object - method one = 1 - end) + object + method one = 1 + end ;; ignore - (object - method one = 1 - end) + object + method one = 1 + end ;; let () = diff --git a/test/passing/refs.janestreet/extensions-indent.ml.ref b/test/passing/refs.janestreet/extensions-indent.ml.ref index b1d639871a..45cb2c9f15 100644 --- a/test/passing/refs.janestreet/extensions-indent.ml.ref +++ b/test/passing/refs.janestreet/extensions-indent.ml.ref @@ -417,9 +417,9 @@ let _ = let _ = f - (object%ext - method x = y - end) + object%ext + method x = y + end ;; let _ = diff --git a/test/passing/refs.janestreet/extensions.ml.ref b/test/passing/refs.janestreet/extensions.ml.ref index 3b8d01078d..4be6e02c03 100644 --- a/test/passing/refs.janestreet/extensions.ml.ref +++ b/test/passing/refs.janestreet/extensions.ml.ref @@ -417,9 +417,9 @@ let _ = let _ = f - (object%ext - method x = y - end) + object%ext + method x = y + end ;; let _ = diff --git a/test/passing/refs.janestreet/labelled_args.ml.ref b/test/passing/refs.janestreet/labelled_args.ml.ref index d254582f3f..f716432836 100644 --- a/test/passing/refs.janestreet/labelled_args.ml.ref +++ b/test/passing/refs.janestreet/labelled_args.ml.ref @@ -1,6 +1,6 @@ let _ = let f ~y = y + 1 in - f ~y:(y : int) + f ~(y : int) ;; let () = diff --git a/test/passing/refs.janestreet/let_punning.ml.ref b/test/passing/refs.janestreet/let_punning.ml.ref index f67c2a3c93..530d7e3868 100644 --- a/test/passing/refs.janestreet/let_punning.ml.ref +++ b/test/passing/refs.janestreet/let_punning.ml.ref @@ -7,22 +7,21 @@ and z = 3 let p = let* x = x - and* y = y + and* y and* z = z in x, y, z ;; let q = - let%foo x = x + let%foo x and y = y - and z = z in + and z in x, y, z ;; let r = let* (* 1 *) x (* 2 *) = (* 3 *) x (* 4 *) - and* (* 5 *) y = - y + and* (* 5 *) y (* 6 *) in x, y @@ -30,8 +29,7 @@ let r = let s = let%foo (* 1 *) x (* 2 *) = (* 3 *) x (* 4 *) - and (* 5 *) y = - y + and (* 5 *) y (* 6 *) in x, y diff --git a/test/passing/refs.janestreet/object.ml.ref b/test/passing/refs.janestreet/object.ml.ref index 2cdcd089b5..b762b72e29 100644 --- a/test/passing/refs.janestreet/object.ml.ref +++ b/test/passing/refs.janestreet/object.ml.ref @@ -56,8 +56,8 @@ type t = (int, int) #q let _ = object%js end let _ = object%js (super) end let _ = object%js (super : 'a) end -let _ = f (object end) -let _ = f (object%js end) +let _ = f object end +let _ = f object%js end class t ~a = object diff --git a/test/passing/refs.janestreet/object_expr.ml.ref b/test/passing/refs.janestreet/object_expr.ml.ref index 04161f2715..5edb4b5a01 100644 --- a/test/passing/refs.janestreet/object_expr.ml.ref +++ b/test/passing/refs.janestreet/object_expr.ml.ref @@ -1,19 +1,19 @@ -(object - method one = 1 -end) +object + method one = 1 +end #one ;; Some - (object - method one = 1 - end) + object + method one = 1 + end ;; ignore - (object - method one = 1 - end) + object + method one = 1 + end ;; let () = diff --git a/test/passing/refs.ocamlformat/extensions-indent.ml.ref b/test/passing/refs.ocamlformat/extensions-indent.ml.ref index b134617a6a..3fe66568a1 100644 --- a/test/passing/refs.ocamlformat/extensions-indent.ml.ref +++ b/test/passing/refs.ocamlformat/extensions-indent.ml.ref @@ -348,9 +348,9 @@ let _ = let _ = f - (object%ext - method x = y - end ) + object%ext + method x = y + end let _ = f diff --git a/test/passing/refs.ocamlformat/extensions.ml.ref b/test/passing/refs.ocamlformat/extensions.ml.ref index 964f5d299b..0bf8ce5d02 100644 --- a/test/passing/refs.ocamlformat/extensions.ml.ref +++ b/test/passing/refs.ocamlformat/extensions.ml.ref @@ -348,9 +348,9 @@ let _ = let _ = f - (object%ext - method x = y - end ) + object%ext + method x = y + end let _ = f diff --git a/test/passing/refs.ocamlformat/labelled_args.ml.ref b/test/passing/refs.ocamlformat/labelled_args.ml.ref index fd4f37ee3d..52d2af9aaa 100644 --- a/test/passing/refs.ocamlformat/labelled_args.ml.ref +++ b/test/passing/refs.ocamlformat/labelled_args.ml.ref @@ -1,6 +1,6 @@ let _ = let f ~y = y + 1 in - f ~y:(y : int) + f ~(y : int) let () = very_long_function_name diff --git a/test/passing/refs.ocamlformat/let_punning.ml.ref b/test/passing/refs.ocamlformat/let_punning.ml.ref index 192768574f..feaee6b37c 100644 --- a/test/passing/refs.ocamlformat/let_punning.ml.ref +++ b/test/passing/refs.ocamlformat/let_punning.ml.ref @@ -9,25 +9,23 @@ and y = 2 and z = 3 let p = - let* x = x and* y = y and* z = z in + let* x = x and* y and* z = z in (x, y, z) let q = - let%foo x = x and y = y and z = z in + let%foo x and y = y and z in (x, y, z) let r = let* (* 1 *) x (* 2 *) = (* 3 *) x (* 4 *) - and* (* 5 *) y = - y + and* (* 5 *) y (* 6 *) in (x, y) let s = let%foo (* 1 *) x (* 2 *) = (* 3 *) x (* 4 *) - and (* 5 *) y = - y + and (* 5 *) y (* 6 *) in (x, y) diff --git a/test/passing/refs.ocamlformat/object.ml.ref b/test/passing/refs.ocamlformat/object.ml.ref index b144b72d9d..9ac71ba309 100644 --- a/test/passing/refs.ocamlformat/object.ml.ref +++ b/test/passing/refs.ocamlformat/object.ml.ref @@ -73,9 +73,9 @@ let _ = object%js (super) end let _ = object%js (super : 'a) end -let _ = f (object end) +let _ = f object end -let _ = f (object%js end) +let _ = f object%js end class t ~a = object diff --git a/test/passing/refs.ocamlformat/object_expr.ml.ref b/test/passing/refs.ocamlformat/object_expr.ml.ref index 9b87079223..9bc58b25fd 100644 --- a/test/passing/refs.ocamlformat/object_expr.ml.ref +++ b/test/passing/refs.ocamlformat/object_expr.ml.ref @@ -1,19 +1,19 @@ -(object - method one = 1 -end ) +object + method one = 1 +end #one ;; Some - (object - method one = 1 - end ) + object + method one = 1 + end ;; ignore - (object - method one = 1 - end ) + object + method one = 1 + end ;; let () = diff --git a/test/passing/tests/effects.ml.opts b/test/passing/tests/effects.ml.opts deleted file mode 100644 index 99fe977815..0000000000 --- a/test/passing/tests/effects.ml.opts +++ /dev/null @@ -1 +0,0 @@ ---ocaml-version=5.3