Update to ocamlformat 0.22.4

Author: jonludlam

.ocamlformat

@@ -1 +1 @@
-version=0.17.0
+version=0.22.4

src/ast.ml

@@ -8,7 +8,6 @@
     are out of range. *)
 
 type 'a with_location = 'a Loc.with_location
-
 type style = [ `Bold | `Italic | `Emphasis | `Superscript | `Subscript ]
 
 type reference_kind = [ `Simple | `With_text ]
@@ -23,8 +22,7 @@ type inline_element =
   | `Reference of
     reference_kind * string with_location * inline_element with_location list
   | `Link of string * inline_element with_location list
-  | `Math_span of string (** @since 2.0.0 *)
-]
+  | `Math_span of string  (** @since 2.0.0 *) ]
 (** Inline elements are equivalent to what would be found in a [span] in HTML.
     Mostly these are straightforward. The [`Reference] constructor takes a triple
     whose second element is the reference itself, and the third the replacement
@@ -43,7 +41,7 @@ type nestable_block_element =
     [ `Unordered | `Ordered ]
     * [ `Light | `Heavy ]
     * nestable_block_element with_location list list
-  | `Math_block of string (** @since 2.0.0 *) ]
+  | `Math_block of string  (** @since 2.0.0 *) ]
 (** Some block elements may be nested within lists or tags, but not all.
     The [`List] constructor has a parameter of type [\[`Light | `Heavy\]].
     This corresponds to the syntactic constructor used (see the
@@ -71,7 +69,6 @@ type ocamldoc_tag =
 (** ocamldoc tags are those that are specified in the {{:https://ocaml.org/releases/4.12/htmlman/ocamldoc.html#ss:ocamldoc-tags}manual}) *)
 
 type tag = [ ocamldoc_tag | internal_tag ]
-
 type heading = int * string option * inline_element with_location list
 
 type block_element =

src/loc.ml

@@ -1,17 +1,11 @@
 type point = { line : int; column : int }
-
 type span = { file : string; start : point; end_ : point }
-
 type +'a with_location = { location : span; value : 'a }
 
 let at location value = { location; value }
-
 let location { location; _ } = location
-
 let value { value; _ } = value
-
 let map f annotated = { annotated with value = f annotated.value }
-
 let same annotated value = { annotated with value }
 
 let span spans =

src/odoc_parser.ml

@@ -30,8 +30,8 @@ type t = {
    [offset], relative to the beginning of a comment, into a location, relative
    to the beginning of the file containing the comment. This can then be used
    to convert from byte offset to line number / column number - a Loc.point,
-   and additionally for converting back from a Loc.point to a Lexing.position. 
-   *)
+   and additionally for converting back from a Loc.point to a Lexing.position.
+*)
 
 let reversed_newlines : input:string -> (int * int) list =
  fun ~input ->
@@ -118,5 +118,4 @@ let parse_comment ~location ~text =
 
 (* Accessor functions, as [t] is opaque *)
 let warnings t = t.warnings
-
 let ast t = t.ast

src/syntax.ml

@@ -29,7 +29,6 @@ type input = {
 (* {2 Output} *)
 
 let add_warning input warning = input.warnings := warning :: !(input.warnings)
-
 let junk input = Stream.junk input.tokens
 
 let peek input =
@@ -355,7 +354,8 @@ let paragraph : input -> Ast.nestable_block_element with_location =
    fun acc ->
     match npeek 2 input with
     | { value = `Single_newline ws; location }
-      :: { value = #token_that_always_begins_an_inline_element; _ } :: _ ->
+      :: { value = #token_that_always_begins_an_inline_element; _ }
+      :: _ ->
         junk input;
         let acc = Loc.at location (`Space ws) :: acc in
         let acc = paragraph_line acc in
@@ -371,34 +371,34 @@ let paragraph : input -> Ast.nestable_block_element with_location =
 (* {3 Helper types} *)
 
 (* The interpretation of tokens in the block parser depends on where on a line
-   each token appears. The five possible "locations" are:
-
-   - [`At_start_of_line], when only whitespace has been read on the current
-     line.
-   - [`After_tag], when a valid tag token, such as [@deprecated], has been read,
-     and only whitespace has been read since.
-   - [`After_shorthand_bullet], when a valid shorthand list item bullet, such as
-     [-], has been read, and only whitespace has been read since.
-   - [`After_explicit_list_bullet], when a valid explicit bullet, such as [{li],
-     has been read, and only whitespace has been read since.
-   - [`After_text], when any other valid non-whitespace token has already been
-     read on the current line.
-
-   Here are some examples of how this affects the interpretation of tokens:
-
-   - A paragraph can start anywhere except [`After_text] (two paragraphs cannot
-     be on the same line, but paragraphs can be nested in just about anything).
-   - [`Minus] is interpreted as a list item bullet [`At_start_of_line],
-     [`After_tag], and [`After_explicit_list_bullet].
-   - Tags are only allowed [`At_start_of_line].
-
-  To track the location accurately, the functions that make up the block parser
-  pass explicit [where_in_line] values around and return them.
-
-  In a few cases, [where_in_line] can be inferred from what helper was called.
-  For example, the [paragraph] parser always stops on the same line as the last
-  significant token that is in the paragraph it consumed, so the location must
-  be [`After_text]. *)
+    each token appears. The five possible "locations" are:
+
+    - [`At_start_of_line], when only whitespace has been read on the current
+      line.
+    - [`After_tag], when a valid tag token, such as [@deprecated], has been read,
+      and only whitespace has been read since.
+    - [`After_shorthand_bullet], when a valid shorthand list item bullet, such as
+      [-], has been read, and only whitespace has been read since.
+    - [`After_explicit_list_bullet], when a valid explicit bullet, such as [{li],
+      has been read, and only whitespace has been read since.
+    - [`After_text], when any other valid non-whitespace token has already been
+      read on the current line.
+
+    Here are some examples of how this affects the interpretation of tokens:
+
+    - A paragraph can start anywhere except [`After_text] (two paragraphs cannot
+      be on the same line, but paragraphs can be nested in just about anything).
+    - [`Minus] is interpreted as a list item bullet [`At_start_of_line],
+      [`After_tag], and [`After_explicit_list_bullet].
+    - Tags are only allowed [`At_start_of_line].
+
+   To track the location accurately, the functions that make up the block parser
+   pass explicit [where_in_line] values around and return them.
+
+   In a few cases, [where_in_line] can be inferred from what helper was called.
+   For example, the [paragraph] parser always stops on the same line as the last
+   significant token that is in the paragraph it consumed, so the location must
+   be [`After_text]. *)
 type where_in_line =
   [ `At_start_of_line
   | `After_tag
@@ -438,7 +438,6 @@ type stopped_implicitly =
 
 (* Ensure that the above two types are really subsets of [Token.t]. *)
 let _check_subset : stops_at_delimiters -> Token.t = fun t -> (t :> Token.t)
-
 let _check_subset : stopped_implicitly -> Token.t = fun t -> (t :> Token.t)
 
 (* The different contexts in which the block parser [block_element_list] can be
@@ -907,8 +906,7 @@ let rec block_element_list :
           |> accepted_in_all_contexts context
           |> Loc.at location
         in
-        consume_block_elements ~parsed_a_tag `At_start_of_line
-          (paragraph :: acc)
+        consume_block_elements ~parsed_a_tag `At_start_of_line (paragraph :: acc)
   in
 
   let where_in_line =
@@ -993,8 +991,7 @@ and explicit_list_items :
     let next_token = peek input in
     match next_token.value with
     | `End ->
-        Parse_error.not_allowed next_token.location
-          ~what:(Token.describe `End)
+        Parse_error.not_allowed next_token.location ~what:(Token.describe `End)
           ~in_what:(Token.describe parent_markup)
         |> add_warning input;
         (List.rev acc, next_token.location)
@@ -1043,8 +1040,7 @@ and explicit_list_items :
         | `Right_brace -> junk input
         | `End ->
             Parse_error.not_allowed token_after_list_item.location
-              ~what:(Token.describe `End)
-              ~in_what:(Token.describe token)
+              ~what:(Token.describe `End) ~in_what:(Token.describe token)
             |> add_warning input);
 
         let acc = content :: acc in
@@ -1092,7 +1088,7 @@ let parse warnings tokens =
         in
 
         junk input;
-        elements @ block :: parse_block_elements ()
+        elements @ (block :: parse_block_elements ())
   in
   let ast = parse_block_elements () in
   (ast, List.rev !(input.warnings))

src/token.ml

@@ -3,9 +3,7 @@
    for error messages. *)
 
 type section_heading = [ `Begin_section_heading of int * string option ]
-
 type style = [ `Bold | `Italic | `Emphasis | `Superscript | `Subscript ]
-
 type paragraph_style = [ `Left | `Center | `Right ]
 
 type tag =

test/test.ml

@@ -19,9 +19,7 @@ module Ast_to_sexp = struct
   type at = { at : 'a. ('a -> sexp) -> 'a Loc.with_location -> sexp }
 
   let loc_at = { at = Location_to_sexp.at }
-
   let str s = Atom s
-
   let opt f s = match s with Some s -> List [ f s ] | None -> List []
 
   let style : Ast.style -> sexp = function