Skip to content

Commit 9775096

Browse files
author
Guillaume Petiot
committed
Release 0.22.2 (Fix cram test)
1 parent 364aaa8 commit 9775096

9 files changed

+18
-18
lines changed

CHANGES.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## 0.22.1 (2022-05-24)
1+
## 0.22.2 (2022-05-24)
22

33
### Removed
44

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Alternatively, see [`ocamlformat.opam`](./ocamlformat.opam) for manual build ins
2929
Setting up your project to use the default profile and the OCamlFormat version you installed (hopefully the last one) in this `.ocamlformat` file is considered good practice:
3030
```
3131
profile = default
32-
version = 0.22.1
32+
version = 0.22.2
3333
```
3434

3535
To manually invoke OCamlformat the general command is:

doc/faq.mld

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ The recommended way is to use a versioned default profile, such as:
2121

2222
{[
2323
profile = default
24-
version = 0.22.1
24+
version = 0.22.2
2525
]}
2626

2727
(or replace with the output of [ocamlformat --version])

doc/getting_started.mld

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ dune build @install
2121
First of all, make sure you have an [.ocamlformat] file at the root of your project. Setting up your project to use the default profile and the OCamlFormat version you installed (hopefully the last one) in this [.ocamlformat] file is considered good practice:
2222
{[
2323
profile = default
24-
version = 0.22.1
24+
version = 0.22.2
2525
]}
2626

2727
To manually invoke OCamlformat the general command is:

lib/Conf.ml

+6-6
Original file line numberDiff line numberDiff line change
@@ -201,15 +201,15 @@ module Formatting = struct
201201

202202
let ( (* align_cases *) ) =
203203
let names = ["align-cases"] in
204-
C.removed_option ~names ~since:V0_22_0 ~msg:""
204+
C.removed_option ~names ~since:V0_22_2 ~msg:""
205205

206206
let ( (* align_constructors_decl *) ) =
207207
let names = ["align-constructors-decl"] in
208-
C.removed_option ~names ~since:V0_22_0 ~msg:""
208+
C.removed_option ~names ~since:V0_22_2 ~msg:""
209209

210210
let ( (* align_variants_decl *) ) =
211211
let names = ["align-variants-decl"] in
212-
C.removed_option ~names ~since:V0_22_0 ~msg:""
212+
C.removed_option ~names ~since:V0_22_2 ~msg:""
213213

214214
let assignment_operator =
215215
let doc = "Position of the assignment operator." in
@@ -1201,7 +1201,7 @@ let ( (* disable_outside_detected_project *) ) =
12011201
enable the opposite behavior use `enable-outside-detected-project`."
12021202
in
12031203
let names = ["disable-outside-detected-project"] in
1204-
C.removed_option ~names ~since:V0_22_0 ~msg
1204+
C.removed_option ~names ~since:V0_22_2 ~msg
12051205

12061206
let enable_outside_detected_project =
12071207
let witness =
@@ -1642,8 +1642,8 @@ let (_profile : fmt_opts option C.t) =
16421642
in
16431643
C.choice ~names ~all ~doc ~kind:C.Formatting
16441644
~removed_values:
1645-
[ C.Value_removed.make ~name:"compact" ~since:V0_22_0 ~msg:""
1646-
; C.Value_removed.make ~name:"sparse" ~since:V0_22_0 ~msg:"" ]
1645+
[ C.Value_removed.make ~name:"compact" ~since:V0_22_2 ~msg:""
1646+
; C.Value_removed.make ~name:"sparse" ~since:V0_22_2 ~msg:"" ]
16471647
(fun conf p ->
16481648
selected_profile_ref := p ;
16491649
let new_fmt_opts = Option.value p ~default:conf.fmt_opts in

lib/Version.ml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ type t =
1616
| V0_16_0
1717
| V0_17_0
1818
| V0_20_0
19-
| V0_22_0
19+
| V0_22_2
2020
| V1_0_0
2121

2222
let to_string = function
@@ -26,7 +26,7 @@ let to_string = function
2626
| V0_16_0 -> "0.16.0"
2727
| V0_17_0 -> "0.17.0"
2828
| V0_20_0 -> "0.20.0"
29-
| V0_22_0 -> "0.22.0"
29+
| V0_22_2 -> "0.22.2"
3030
| V1_0_0 -> "1.0.0"
3131

3232
let pp fs v = Format.fprintf fs "%s" (to_string v)

lib/Version.mli

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ type t =
1616
| V0_16_0
1717
| V0_17_0
1818
| V0_20_0
19-
| V0_22_0
19+
| V0_22_2
2020
| V1_0_0
2121

2222
val to_string : t -> string

ocamlformat-help.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -451,16 +451,16 @@ OPTIONS (CODE FORMATTING STYLE)
451451

452452
OPTIONS (REMOVED)
453453
--align-cases=VAL
454-
This option has been removed in version 0.22.0.
454+
This option has been removed in version 0.22.2.
455455

456456
--align-constructors-decl=VAL
457-
This option has been removed in version 0.22.0.
457+
This option has been removed in version 0.22.2.
458458

459459
--align-variants-decl=VAL
460-
This option has been removed in version 0.22.0.
460+
This option has been removed in version 0.22.2.
461461

462462
--disable-outside-detected-project=VAL
463-
This option has been removed in version 0.22.0. OCamlFormat is
463+
This option has been removed in version 0.22.2. OCamlFormat is
464464
disabled outside of a detected project by default, to enable the
465465
opposite behavior use `enable-outside-detected-project`.
466466

test/cli/conf.t

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Exit code is printed by hand because sed succeeding would hide the error.
77

88
$ (<a.ml ocamlformat --impl -; echo [$?]) 2>&1 | sed 's/version is "[^"]*"/version is "..."/g'
99
ocamlformat: Error while parsing $TESTCASE_ROOT/.ocamlformat:
10-
Project should be formatted using ocamlformat version "bad", but the installed version is "unknown"
10+
Project should be formatted using ocamlformat version "bad", but the installed version is "..."
1111
[1]
1212

1313
Invalid syntax in .ocamlformat file:

0 commit comments

Comments
 (0)