Merge pull request #11 from pascutto/ocamlformat-upgrade

Upgrade ocamlformat and fix packaging

.ocamlformat

@@ -1,5 +1,4 @@
-version = 0.16.0
-profile = conventional
-break-infix = fit-or-vertical
+version = 0.19.0
 parse-docstrings = true
-indicate-multiline-delimiters = no
+break-infix = fit-or-vertical
+module-item-spacing = compact

bench/main.ml

@@ -2,11 +2,8 @@ open Bechamel
 open Toolkit
 
 let () = Random.self_init ()
-
 let random_char () = char_of_int (Random.int 256)
-
 let random_string n = String.init n (fun _i -> random_char ())
-
 let create size = Staged.stage (fun () -> Bloomf.create size)
 
 let add size =
@@ -75,9 +72,7 @@ let benchmark () =
   |> Analyze.merge ols instances
 
 let () = Bechamel_notty.Unit.add Instance.monotonic_clock "ns"
-
 let () = Bechamel_notty.Unit.add Instance.minor_allocated "w"
-
 let () = Bechamel_notty.Unit.add Instance.major_allocated "mw"
 
 let img (window, results) =

bloomf-bench.opam

@@ -1,6 +1,6 @@
 opam-version: "2.0"
-maintainer:   "Clément Pascutto"
-authors:      ["Clément Pascutto"]
+maintainer:   "Clément Pascutto <clement@pascutto.fr>"
+authors:      "Clément Pascutto <clement@pascutto.fr>"
 license:      "MIT"
 homepage:     "https://github.com/mirage/bloomf"
 bug-reports:  "https://github.com/mirage/bloomf/issues"
@@ -13,12 +13,12 @@ build: [
     "dune"
     "build"
     "-p"
-  name
+    name
     "-j"
     jobs
     "@install"
     "@runtest" {with-test}
-  "@doc" {with-doc}
+    "@doc" {with-doc}
   ]
 ]
 
@@ -27,7 +27,7 @@ depends: [
   "dune" {>= "2.0.0"}
   "bloomf" {=version}
   "bechamel-notty"
-  "alcotest" {with-test}
+  "alcotest" {>= "1.0.0" & with-test}
 ]
 synopsis: "Benchmarking package for `bloomf`"
 description: "Benchmarking package for `bloomf`"

bloomf.opam

@@ -1,6 +1,6 @@
 opam-version: "2.0"
-maintainer:   "Clément Pascutto"
-authors:      ["Clément Pascutto"]
+maintainer:   "Clément Pascutto <clement@pascutto.fr>"
+authors:      "Clément Pascutto <clement@pascutto.fr>"
 license:      "MIT"
 homepage:     "https://github.com/mirage/bloomf"
 bug-reports:  "https://github.com/mirage/bloomf/issues"
@@ -13,20 +13,20 @@ build: [
     "dune"
     "build"
     "-p"
-  name
+    name
     "-j"
     jobs
     "@install"
     "@runtest" {with-test}
-  "@doc" {with-doc}
+    "@doc" {with-doc}
   ]
 ]
 
 depends: [
   "ocaml"   {>= "4.03.0"}
   "dune"    {>= "1.7.0"}
   "bitv"    {>= "1.4"}
-  "alcotest" {with-test}
+  "alcotest" {>= "1.0.0" & with-test}
 ]
 synopsis: "Efficient Bloom filters for OCaml"
 description: "Efficient Bloom filters for OCaml"

src/bloomf.ml

@@ -1,5 +1,4 @@
 type priv = { m : int; k : int; p_len : (int * int) list; b : Bitv.t }
-
 type 'a t = priv
 
 let rec gcd a b = if b = 0 then a else gcd b (a mod b)
@@ -63,7 +62,6 @@ let op f bf1 bf2 =
   { m = bf1.m; k = bf2.k; p_len = bf1.p_len; b = f bf1.b bf2.b }
 
 let union bf1 bf2 = op Bitv.bw_or bf1 bf2
-
 let inter bf1 bf2 = op Bitv.bw_and bf1 bf2
 
 let mem_priv t hashed_data =
@@ -77,7 +75,6 @@ let mem_priv t hashed_data =
   loop t.p_len
 
 let mem bf data = mem_priv bf (Hashtbl.hash data)
-
 let clear t = Bitv.fill t.b 0 t.m false
 
 (* Bitv.pop is really slow *)
@@ -90,7 +87,6 @@ let size_estimate t =
 (* Serialisers *)
 
 external set_64 : bytes -> int -> int64 -> unit = "%caml_string_set64u"
-
 external swap64 : int64 -> int64 = "%bswap_int64"
 
 let set_uint64 buf off v =
@@ -146,16 +142,10 @@ module Make (H : Hashable) = struct
   type t = priv
 
   let create = create
-
   let add bf data = add_priv bf (H.hash data)
-
   let mem bf data = mem_priv bf (H.hash data)
-
   let clear = clear
-
   let size_estimate = size_estimate
-
   let to_bytes = to_bytes
-
   let of_bytes = of_bytes
 end

src/bloomf.mli

@@ -19,8 +19,8 @@ val create : ?error_rate:float -> int -> 'a t
 (** [create ~error_rate size] creates a fresh BF for which expected false
     positive rate when filled with [size] elements is [error_rate].
 
-    @raise Invalid_argument if [error_rate] is not in \]0, 1\[, or [size] is
-    negative. *)
+    @raise Invalid_argument
+      if [error_rate] is not in \]0, 1\[, or [size] is negative. *)
 
 val add : 'a t -> 'a -> unit
 (** [add t e] adds [e] to [t]. *)
@@ -57,7 +57,6 @@ val size_estimate : 'a t -> int
 (** {2 Serializers/Deserializers} *)
 
 val to_bytes : 'a t -> bytes
-
 val of_bytes : bytes -> ('a t, [ `Msg of string ]) result
 
 (** {1 Functorial interface} *)
@@ -80,16 +79,10 @@ module Make (H : Hashable) : sig
   type t
 
   val create : ?error_rate:float -> int -> t
-
   val add : t -> H.t -> unit
-
   val mem : t -> H.t -> bool
-
   val clear : t -> unit
-
   val size_estimate : t -> int
-
   val to_bytes : t -> bytes
-
   val of_bytes : bytes -> (t, [ `Msg of string ]) result
 end

test/main.ml

@@ -1,7 +1,5 @@
 let () = Random.self_init ()
-
 let random_char () = char_of_int (Random.int 256)
-
 let random_string n = String.init n (fun _i -> random_char ())
 
 module StringSet = Set.Make (String)
@@ -75,7 +73,6 @@ let test_op msg bop sop =
     sizes
 
 let test_union () = test_op "union" Bloomf.union StringSet.union
-
 let test_inter () = test_op "intersection" Bloomf.inter StringSet.inter
 
 let test_bytes () =