Skip to content

Commit 382573c

Browse files
authored
Update ocamlformat to 0.27.0 (#250)
* dune fmt --auto-promote Signed-off-by: Sora Morimoto <[email protected]> * Update ocamlformat to 0.27.0 Signed-off-by: Sora Morimoto <[email protected]> --------- Signed-off-by: Sora Morimoto <[email protected]>
1 parent 077243a commit 382573c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+458
-322
lines changed

.ocamlformat

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,33 @@
1-
version=0.26.2
2-
break-cases = fit
3-
break-collection-expressions = fit-or-vertical
4-
break-fun-decl = wrap
5-
break-fun-sig = wrap
6-
break-infix = wrap
7-
break-infix-before-func = false
8-
break-sequences = false
9-
break-separators = before
10-
break-string-literals = never
11-
break-struct = force
12-
cases-matching-exp-indent = compact
13-
doc-comments = after-when-possible
14-
dock-collection-brackets = false
15-
indicate-multiline-delimiters = no
16-
infix-precedence = indent
17-
let-and = compact
18-
let-binding-spacing = compact
19-
module-item-spacing = compact
20-
parens-tuple = multi-line-only
21-
parens-tuple-patterns = multi-line-only
22-
sequence-style = terminator
23-
sequence-blank-line = compact
24-
single-case = compact
25-
type-decl = compact
26-
if-then-else = keyword-first
27-
field-space = loose
28-
space-around-arrays = false
29-
space-around-records = false
30-
space-around-lists = false
31-
space-around-variants = false
32-
ocp-indent-compat = true
1+
version=0.27.0
2+
break-cases=fit
3+
break-collection-expressions=fit-or-vertical
4+
break-fun-decl=wrap
5+
break-fun-sig=wrap
6+
break-infix-before-func=false
7+
break-infix=wrap
8+
break-separators=before
9+
break-sequences=false
10+
break-string-literals=never
11+
break-struct=force
12+
cases-matching-exp-indent=compact
13+
doc-comments=after-when-possible
14+
dock-collection-brackets=false
15+
field-space=loose
16+
if-then-else=keyword-first
17+
indicate-multiline-delimiters=no
18+
infix-precedence=indent
19+
let-and=compact
20+
let-binding-spacing=compact
21+
module-item-spacing=compact
22+
ocp-indent-compat=true
23+
parens-tuple-patterns=multi-line-only
24+
parens-tuple=multi-line-only
25+
parse-docstrings=false
26+
sequence-blank-line=compact
27+
sequence-style=terminator
28+
single-case=compact
29+
space-around-arrays=false
30+
space-around-lists=false
31+
space-around-records=false
32+
space-around-variants=false
33+
type-decl=compact

src/baselib/dune

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,29 @@
11
(library
2-
(name ocsigen_lib_base)
3-
(public_name ocsigenserver.baselib.base)
4-
(flags (:standard -no-keep-locs))
5-
(modules ocsigen_lib_base)
6-
(libraries lwt))
2+
(name ocsigen_lib_base)
3+
(public_name ocsigenserver.baselib.base)
4+
(flags
5+
(:standard -no-keep-locs))
6+
(modules ocsigen_lib_base)
7+
(libraries lwt))
78

89
(library
9-
(name baselib)
10-
(public_name ocsigenserver.baselib)
11-
(wrapped false)
12-
(flags (:standard -no-keep-locs))
13-
(modules
14-
dynlink_wrapper
15-
ocsigen_cache
16-
ocsigen_config_static
17-
ocsigen_lib
18-
ocsigen_loader
19-
ocsigen_stream)
20-
(libraries
21-
str findlib lwt_log lwt.unix cryptokit re ocsigen_lib_base
22-
(select dynlink_wrapper.ml from
23-
(dynlink -> dynlink_wrapper.natdynlink.ml)
24-
(_ -> dynlink_wrapper.nonatdynlink.ml))))
10+
(name baselib)
11+
(public_name ocsigenserver.baselib)
12+
(wrapped false)
13+
(flags
14+
(:standard -no-keep-locs))
15+
(modules dynlink_wrapper ocsigen_cache ocsigen_config_static ocsigen_lib
16+
ocsigen_loader ocsigen_stream)
17+
(libraries
18+
str
19+
findlib
20+
lwt_log
21+
lwt.unix
22+
cryptokit
23+
re
24+
ocsigen_lib_base
25+
(select
26+
dynlink_wrapper.ml
27+
from
28+
(dynlink -> dynlink_wrapper.natdynlink.ml)
29+
(_ -> dynlink_wrapper.nonatdynlink.ml))))

src/baselib/dynlink_wrapper.natdynlink.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* You should have received a copy of the GNU Lesser General Public License
1717
* along with this program; if not, write to the Free Software
1818
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
19-
*)
19+
*)
2020

2121
open Dynlink
2222

src/baselib/dynlink_wrapper.nonatdynlink.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* You should have received a copy of the GNU Lesser General Public License
1717
* along with this program; if not, write to the Free Software
1818
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
19-
*)
19+
*)
2020

2121
exception Error of string
2222

src/baselib/ocsigen_cache.ml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* You should have received a copy of the GNU Lesser General Public License
1515
* along with this program; if not, write to the Free Software
1616
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
17-
*)
17+
*)
1818
(**
1919
Cache.
2020
@@ -124,9 +124,9 @@ end = struct
124124
; mutable maxsize : int
125125
; mutable finaliser_before : 'a node -> unit
126126
; mutable finaliser_after : 'a node -> unit
127-
; (* *) time_bound : time_bound option }
127+
; time_bound : time_bound option }
128128

129-
and time_bound = {(* *) timer : float; mutable collector : unit Lwt.t option}
129+
and time_bound = {timer : float; mutable collector : unit Lwt.t option}
130130

131131
(* Checks (by BY):
132132
@@ -435,7 +435,7 @@ functor
435435
; mutable table : (A.value * A.key Dlist.node) H.t
436436
; finder : A.key -> A.value Lwt.t
437437
; clear : unit -> unit
438-
(* This function clears the cache. It is put inside the
438+
(* This function clears the cache. It is put inside the
439439
cache structure so that it is garbage-collected only when the cache
440440
is no longer referenced, as the functions themselves are put inside
441441
a weak hash table *)

src/baselib/ocsigen_cache.mli

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* You should have received a copy of the GNU Lesser General Public License
1515
* along with this program; if not, write to the Free Software
1616
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
17-
*)
17+
*)
1818

1919
(**
2020
Cache.

src/baselib/ocsigen_lib.ml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* You should have received a copy of the GNU Lesser General Public License
1515
* along with this program; if not, write to the Free Software
1616
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
17-
*)
17+
*)
1818

1919
include Ocsigen_lib_base
2020
module String = String_base
@@ -69,8 +69,9 @@ module Filename = struct
6969
then String.sub filename (pos + 1) (String.length filename - pos - 1)
7070
else (* Dot before a directory separator *)
7171
raise Not_found
72-
with Not_found -> (* No dot in filename *)
73-
raise Not_found
72+
with Not_found ->
73+
(* No dot in filename *)
74+
raise Not_found
7475
end
7576

7677
(*****************************************************************************)
@@ -399,7 +400,6 @@ module Url = struct
399400
https, host, port, path, query
400401
in
401402
(* Note that the fragment (string after #) is not sent by browsers *)
402-
403403
(*20110707 ' ' is encoded to '+' in queries, but not in paths.
404404
Warning: if we write the URL manually, we must encode ' ' to '+' manually
405405
(not done by the browser).

src/baselib/ocsigen_lib.mli

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* You should have received a copy of the GNU Lesser General Public License
1515
* along with this program; if not, write to the Free Software
1616
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
17-
*)
17+
*)
1818

1919
(** This module contains some auxiliaries for the Ocsigenserver. In contrast to
2020
{!Ocsigen_lib_base}, the function may also refer to libraries other than the

src/baselib/ocsigen_lib_base.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* You should have received a copy of the GNU Lesser General Public License
1515
* along with this program; if not, write to the Free Software
1616
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
17-
*)
17+
*)
1818

1919
exception Ocsigen_Internal_Error of string
2020
exception Input_is_too_large

src/baselib/ocsigen_lib_base.mli

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* You should have received a copy of the GNU Lesser General Public License
1515
* along with this program; if not, write to the Free Software
1616
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
17-
*)
17+
*)
1818

1919
(** This module just contains only extensions of the standard library and very
2020
basic Ocsigen values and exceptions. Cf. {!Ocsigen_lib} for functionality

0 commit comments

Comments
 (0)