reformat all the things

Author: c-cube

.ocamlformat

@@ -5,7 +5,7 @@ if-then-else=k-r
 parens-ite=true
 parens-tuple=multi-line-only
 sequence-style=terminator
-type-decl=compact
+type-decl=sparse
 break-cases=toplevel
 cases-exp-indent=2
 field-space=tight-decl

Makefile

@@ -17,6 +17,13 @@ doc:
 examples:
 	dune build examples/id_sexp.exe
 
+format:
+	@dune build $(DUNE_OPTS) @fmt --auto-promote
+
+format-check:
+	@dune build $(DUNE_OPTS) @fmt --display=quiet
+
+
 VERSION=$(shell awk '/^version:/ {print $$2}' containers.opam)
 
 update_next_tag:

benchs/dune

@@ -1,9 +1,24 @@
 (executables
  (names run_benchs run_bench_hash run_objsize)
- (libraries containers containers_pvec
-            containers-data benchmark gen iter
-   qcheck oseq batteries base sek)
+ (libraries
+  containers
+  containers_pvec
+  containers-data
+  benchmark
+  gen
+  iter
+  qcheck
+  oseq
+  batteries
+  base
+  sek)
  (flags :standard -warn-error -3-5 -safe-string -color always)
  (optional)
- (ocamlopt_flags :standard -O3 -color always -unbox-closures
-   -unbox-closures-factor 20))
+ (ocamlopt_flags
+  :standard
+  -O3
+  -color
+  always
+  -unbox-closures
+  -unbox-closures-factor
+  20))

benchs/run_bench_hash.ml

@@ -1,6 +1,8 @@
 (** Test hash functions *)
 
-type tree = Empty | Node of int * tree list
+type tree =
+  | Empty
+  | Node of int * tree list
 
 let mk_node i l = Node (i, l)
 

benchs/run_benchs.ml

@@ -794,7 +794,9 @@ module Tbl = struct
     val compare : t -> t -> int
   end
 
-  type _ key_type = Int : int key_type | Str : string key_type
+  type _ key_type =
+    | Int : int key_type
+    | Str : string key_type
 
   let arg_make : type a. a key_type -> (module KEY with type t = a) * string =
     function
@@ -918,7 +920,10 @@ module Tbl = struct
 
       module M = CCHashTrie.Make (K)
 
-      type 'a t = { id: CCHashTrie.Transient.t; mutable map: 'a M.t }
+      type 'a t = {
+        id: CCHashTrie.Transient.t;
+        mutable map: 'a M.t;
+      }
 
       let create _ = { id = CCHashTrie.Transient.create (); map = M.empty }
       let find m k = M.get_exn k m.map
@@ -1237,7 +1242,11 @@ module Deque = struct
   end
 
   module Base : DEQUE = struct
-    type 'a elt = { content: 'a; mutable prev: 'a elt; mutable next: 'a elt }
+    type 'a elt = {
+      content: 'a;
+      mutable prev: 'a elt;
+      mutable next: 'a elt;
+    }
     (** A cell holding a single element *)
 
     and 'a t = 'a elt option ref

examples/ccparse_irclogs_real.cond.ml

@@ -14,7 +14,11 @@ let pp_datetime out d =
   CCFormat.(
     fprintf out "{y=%d;M=%d;d=%d;h=%d;m=%d;s=%d}" year month day hour min sec)
 
-type msg = { timestamp: datetime; user: string; msg: string }
+type msg = {
+  timestamp: datetime;
+  user: string;
+  msg: string;
+}
 
 let pp_msg out m =
   CCFormat.fprintf out "{@[time=%a;@ user=%S;@ msg=%S@]}" pp_datetime

examples/ccparse_sexp.ml

@@ -1,6 +1,8 @@
 open CCParse
 
-type sexp = Atom of string | List of sexp list
+type sexp =
+  | Atom of string
+  | List of sexp list
 
 let rec pp_sexpr out (s : sexp) : unit =
   match s with

fuzz/dune

@@ -1,8 +1,9 @@
 (executables
  (flags
   (-w "+a-4-9-29-37-40-42-44-48-50-32" -g))
- (names ccsexp_parse_string_does_not_crash
-   ccutf8_string_uchar_to_bytes_is_same_as_simple_version
-   ccsexp_csexp_reparse)
+ (names
+  ccsexp_parse_string_does_not_crash
+  ccutf8_string_uchar_to_bytes_is_same_as_simple_version
+  ccsexp_csexp_reparse)
  (optional)
  (libraries crowbar containers))

src/bencode/containers_bencode.ml

@@ -1,6 +1,10 @@
 module Str_map = Map.Make (String)
 
-type t = Int of int64 | String of string | List of t list | Map of t Str_map.t
+type t =
+  | Int of int64
+  | String of string
+  | List of t list
+  | Map of t Str_map.t
 
 let rec equal t1 t2 =
   match t1, t2 with

src/bencode/containers_bencode.mli

@@ -6,7 +6,11 @@
 
 module Str_map : module type of Map.Make (String)
 
-type t = Int of int64 | String of string | List of t list | Map of t Str_map.t
+type t =
+  | Int of int64
+  | String of string
+  | List of t list
+  | Map of t Str_map.t
 
 val equal : t -> t -> bool
 val hash : t -> int