ocamlformat: Upgrade to 0.27.0

Author: Julow

.ocamlformat

@@ -1,3 +1,3 @@
 module-item-spacing=preserve
-version=0.26.1
+version=0.27.0
 ocaml-version=4.02

doc/examples/expansion.mli

@@ -1,7 +1,7 @@
 (** Examples of different features of Expansion *)
 
-(** For details on what each of the following examples is showing,
-see the explanations in the {{!page-features}Features page} *)
+(** For details on what each of the following examples is showing, see the
+    explanations in the {{!page-features}Features page} *)
 
 [@@@warning "-67"]
 module Simple : sig
@@ -23,7 +23,8 @@ module Aliases : sig
 end
 
 module ModuleTypeAliases : sig
-  (** Demonstrates that module types are not expanded if they're a simple path to another. *)
+  (** Demonstrates that module types are not expanded if they're a simple path
+      to another. *)
 
   module type A = sig
     type t
@@ -125,7 +126,8 @@ module DeepEquality : sig
 end
 
 module DeepEquality2 : sig
-  (** Demonstrates expansion involving an equation on a type in a submodule, but the submodule is already a simple signature *)
+  (** Demonstrates expansion involving an equation on a type in a submodule, but
+      the submodule is already a simple signature *)
 
   module type MODTYPE = sig
     module X : sig
@@ -172,7 +174,8 @@ module ModuleTypeOf : sig
 end
 
 module ModuleTypeOfComplications : sig
-  (** Demonstrates the interaction of [module type of] and destructive module substitution *)
+  (** Demonstrates the interaction of [module type of] and destructive module
+      substitution *)
 
   module type S = sig
     module X : sig

doc/examples/markup.mli

@@ -1,42 +1,41 @@
 (** Markup examples. *)
 
 (** The OCaml manual gives a
-{{:https://ocaml.org/manual/ocamldoc.html#ss:ocamldoc-placement}comprehensive example}
-of comment placement. This has been replicated in the module Foo below to
-show how this is rendered by [odoc]. *)
+    {{:https://ocaml.org/manual/ocamldoc.html#ss:ocamldoc-placement}comprehensive
+     example} of comment placement. This has been replicated in the module Foo
+    below to show how this is rendered by [odoc]. *)
 
 module type Foo = sig
-  (** The first special comment of the file is the comment associated
-    with the whole module.*)
+  (** The first special comment of the file is the comment associated with the
+      whole module.*)
 
-  (** Special comments can be placed between elements and are kept
-    by the OCamldoc tool, but are not associated to any element.
-    [@]-tags in these comments are ignored.*)
+  (** Special comments can be placed between elements and are kept by the
+      OCamldoc tool, but are not associated to any element. [@]-tags in these
+      comments are ignored.*)
 
   (*******************************************************************)
-  (** Comments like the one above, with more than two asterisks,
-    are ignored. *)
+  (** Comments like the one above, with more than two asterisks, are ignored. *)
 
   (** The comment for function f. *)
   val f : int -> int -> int
   (** The continuation of the comment for function f. *)
 
   (* Hello, I'm a simple comment :-) *)
   exception My_exception of (int -> int) * int
-  (** Comment for exception My_exception, even with a simple comment
-    between the special comment and the exception.*)
+  (** Comment for exception My_exception, even with a simple comment between the
+      special comment and the exception.*)
 
-  (** Comment for type weather  *)
+  (** Comment for type weather *)
   type weather =
     | Rain of int  (** The comment for constructor Rain *)
     | Sun  (** The comment for constructor Sun *)
 
-  (** Comment for type weather2  *)
+  (** Comment for type weather2 *)
   type weather2 =
     | Rain of int  (** The comment for constructor Rain *)
     | Sun  (** The comment for constructor Sun *)
-  (** I can continue the comment for type weather2 here
-  because there is already a comment associated to the last constructor.*)
+  (** I can continue the comment for type weather2 here because there is already
+      a comment associated to the last constructor.*)
 
   (** The comment for type my_record *)
   type my_record = {
@@ -67,9 +66,8 @@ module type Foo = sig
     val toto : int
     (** The comment for attribute toto. *)
 
-    (** This comment is not attached to titi since
-        there is a blank line before titi, but is kept
-        as a comment in the class. *)
+    (** This comment is not attached to titi since there is a blank line before
+        titi, but is kept as a comment in the class. *)
 
     val titi : string
 
@@ -126,8 +124,8 @@ module Stop : sig
   end
 
   val foo : string
-  (** This value appears in the documentation, since the Stop special comment
-      in the class does not affect the parent module of the class.*)
+  (** This value appears in the documentation, since the Stop special comment in
+      the class does not affect the parent module of the class.*)
 
   (**/**)
 
@@ -137,14 +135,14 @@ module Stop : sig
   (**/**)
 
   type t = string
-  (** The type t appears since in the documentation since the previous stop comment
-  toggled off the "no documentation mode". *)
+  (** The type t appears since in the documentation since the previous stop
+      comment toggled off the "no documentation mode". *)
 end
 
 (** {2 Scoping rules} *)
 module Scope : sig
-  (** In this floating comment I can refer to type {!t} and value {!v}
-    declared later in the signature *)
+  (** In this floating comment I can refer to type {!t} and value {!v} declared
+      later in the signature *)
 
   type t
 
@@ -155,12 +153,12 @@ module Scope : sig
   val y : int
 
   module A : sig
-    (** In this module I can refer to val {!x} declared above as well as
-      type {!u} declared later in the parent module. Elements declared
-      in this signature take priority, so {!y} refers to {!A.y} as
-      opposed to the [y] declared in the parent signature.
-      
-      @see 'markup.mli' for a good time *)
+    (** In this module I can refer to val {!x} declared above as well as type
+        {!u} declared later in the parent module. Elements declared in this
+        signature take priority, so {!y} refers to {!A.y} as opposed to the [y]
+        declared in the parent signature.
+
+        @see 'markup.mli' for a good time *)
 
     val y : string
   end
@@ -174,25 +172,27 @@ module Preamble_examples : sig
   (** This is the comment attached to the declaration of Hidden__Module *)
   module Hidden__Module : sig
     (** This is the top comment declared in the module Hidden__module.
-     
-     This is the second paragraph in the module Hidden__module.
-     
-     @canonical Odoc_examples.Markup.Module *)
+
+        This is the second paragraph in the module Hidden__module.
+
+        @canonical Odoc_examples.Markup.Module *)
 
     type t
     (** This is a comment on type t *)
   end
 
   module Module = Hidden__Module
-  (** This comment is on the declaration of Module as an alias of Hidden__Module *)
+  (** This comment is on the declaration of Module as an alias of Hidden__Module
+  *)
 
-  (** This is the comment attached to the declaration of module Hidden__Module2 *)
+  (** This is the comment attached to the declaration of module Hidden__Module2
+  *)
   module Hidden__Module2 : sig
     (** This is the top comment declared in the module Hidden__module2.
-       
-       This is the second paragraph in the module Hidden__module2.
-       
-       @canonical Odoc_examples.Markup.Module2 *)
+
+        This is the second paragraph in the module Hidden__module2.
+
+        @canonical Odoc_examples.Markup.Module2 *)
 
     type t
     (** This is a comment on type t *)
@@ -202,23 +202,22 @@ module Preamble_examples : sig
 
   module Nonhidden_module : sig
     (** This is the top comment declared in the module Hidden__module2.
-       
-       This is the second paragraph in the module Hidden__module2.
-    *)
+
+        This is the second paragraph in the module Hidden__module2. *)
   end
 
   module Module3 = Nonhidden_module
-  (** This comment is on the declaration of Module3 as an alias of Nonhidden_module *)
+  (** This comment is on the declaration of Module3 as an alias of
+      Nonhidden_module *)
 
   module Nonhidden_module2 : sig
     (** This is the top comment declared in the module Hidden__module2.
-       
-       This is the second paragraph in the module Hidden__module2.
-    *)
+
+        This is the second paragraph in the module Hidden__module2. *)
   end
 
   module Module4 = Nonhidden_module2
 
   (** The [modules] special reference can be used to refer to a list of modules.
-It uses the synopsis from the modules  *)
+      It uses the synopsis from the modules *)
 end

doc/examples/odoc_examples.ml

@@ -1,7 +1,7 @@
 (** Examples of the output from [odoc] *)
 
-(** These examples are intended to be viewed alongside the
-    source code. See {:https://github.com/ocaml/odoc/tree/master/doc/examples} *)
+(** These examples are intended to be viewed alongside the source code. See
+    {:https://github.com/ocaml/odoc/tree/master/doc/examples} *)
 
 module Expansion = Expansion
 module Resolution = Resolution

doc/examples/resolution.mli

@@ -1,8 +1,8 @@
 (** Examples of Path, Fragment and Reference Resolution *)
 
-(** This module contains examples of some of the features of Resolution
-as described in the page {!page-features}. See the explanations there for
-details on what each of these demonstrates. *)
+(** This module contains examples of some of the features of Resolution as
+    described in the page {!page-features}. See the explanations there for
+    details on what each of these demonstrates. *)
 
 [@@@warning "-67"]
 
@@ -28,7 +28,7 @@ end
 
 module HiddenAlias : sig
   (** Demonstrates a reference to an item in a module that's an alias of a
-  hidden module. *)
+      hidden module. *)
 
   (**/**)
 
@@ -108,8 +108,9 @@ module References : sig
     end
   end
 
-  (** We can refer unambiguously to {!module-type-A.t} in module type [A] or {!module-A.t} in module [A],
-and also where there are name clashes within the path: {!module-A.module-B.t} or {!module-A.module-type-B.t} *)
+  (** We can refer unambiguously to {!module-type-A.t} in module type [A] or
+      {!module-A.t} in module [A], and also where there are name clashes within
+      the path: {!module-A.module-B.t} or {!module-A.module-type-B.t} *)
 end
 
 module Complicated_1 : sig

sherlodoc/.ocamlformat

@@ -1,4 +1,4 @@
-version = 0.26.1
+version = 0.27.0
 profile = janestreet
 let-binding-spacing = compact
 sequence-style = separator

sherlodoc/cli/main.ml

@@ -2,18 +2,18 @@ let guess_db_format db_format db_filename =
   match db_format with
   | Some db_format -> db_format
   | None -> begin
-    let ext = Filename.extension db_filename in
-    let ext_len = String.length ext in
-    let ext = if ext_len = 0 then ext else String.sub ext 1 (ext_len - 1) in
-    try List.assoc ext Db_store.available_backends with
-    | Not_found ->
-      Format.fprintf
-        Format.err_formatter
-        "Unknown db format extension %S (expected: %s)@."
-        ext
-        (String.concat ", " @@ List.map fst Db_store.available_backends) ;
-      exit 1
-  end
+      let ext = Filename.extension db_filename in
+      let ext_len = String.length ext in
+      let ext = if ext_len = 0 then ext else String.sub ext 1 (ext_len - 1) in
+      try List.assoc ext Db_store.available_backends with
+      | Not_found ->
+          Format.fprintf
+            Format.err_formatter
+            "Unknown db format extension %S (expected: %s)@."
+            ext
+            (String.concat ", " @@ List.map fst Db_store.available_backends) ;
+          exit 1
+    end
 
 open Cmdliner