Merge pull request #51 from tbrk/fix-master

Fix make on master

bench/benchmarks.ml

@@ -101,9 +101,9 @@ let old_encode_and_decode len =
 
 let args = [ 0; 10; 50; 100; 500; 1000; 2500; 5000 ]
 
-let test_b64 = Test.create_indexed ~name:"Base64" ~args b64_encode_and_decode
+let test_b64 = Bench.Test.create_indexed ~name:"Base64" ~args b64_encode_and_decode
 
-let test_old = Test.create_indexed ~name:"Old" ~args old_encode_and_decode
+let test_old = Bench.Test.create_indexed ~name:"Old" ~args old_encode_and_decode
 
 let command = Bench.make_command [ test_b64; test_old ]
 

bench/dune

@@ -1,3 +1,4 @@
 (executable
  (name benchmarks)
+ (enabled_if (= %{profile} benchmark))
  (libraries base64 core_bench))

dune-project

@@ -1,2 +1,2 @@
-(lang dune 2.0)
+(lang dune 2.3)
 (name base64)

fuzz/dune

@@ -1,9 +1,11 @@
 (executable
  (name fuzz_rfc2045)
+ (enabled_if (= %{profile} fuzz))
  (modules fuzz_rfc2045)
  (libraries astring crowbar fmt base64.rfc2045))
 
 (executable
  (name fuzz_rfc4648)
+ (enabled_if (= %{profile} fuzz))
  (modules fuzz_rfc4648)
  (libraries astring crowbar fmt base64))

fuzz/fuzz_rfc2045.ml

@@ -8,8 +8,8 @@ exception Decode_error of string
 
 let register_printer () =
   Printexc.register_printer (function
-    | Encode_error err -> Some (Fmt.strf "(Encoding error: %s)" err)
-    | Decode_error err -> Some (Fmt.strf "(Decoding error: %s)" err)
+    | Encode_error err -> Some (Fmt.str "(Encoding error: %s)" err)
+    | Decode_error err -> Some (Fmt.str "(Decoding error: %s)" err)
     | _ -> None)
 
 let pp_chr =

fuzz/fuzz_rfc4648.ml

@@ -35,8 +35,7 @@ let pp = pp_scalar ~get:String.get ~length:String.length
 let ( <.> ) f g x = f (g x)
 
 let char_from_alphabet alphabet : string gen =
-  map [ range 64 ]
-    (String.make 1 <.> Char.chr <.> Array.unsafe_get (Base64.alphabet alphabet))
+  map [ range 64 ] (String.make 1 <.> String.get (Base64.alphabet alphabet))
 
 let random_string_from_alphabet alphabet len : string gen =
   let rec add_char_from_alphabet acc = function
@@ -83,7 +82,7 @@ let ( // ) x y =
 
 let canonic alphabet =
   let dmap = Array.make 256 (-1) in
-  Array.iteri (fun i x -> dmap.(x) <- i) (Base64.alphabet alphabet) ;
+  String.iteri (fun i x -> dmap.(Char.code x) <- i) (Base64.alphabet alphabet);
   fun (input, off, len) ->
     let real_len = String.length input in
     let input_len = len in
@@ -108,8 +107,8 @@ let canonic alphabet =
         match remainder_len with 1 -> 0x3c | 2 -> 0x30 | _ -> assert false in
       let decoded = dmap.(Char.code last) in
       let canonic = decoded land mask in
-      let encoded = (Base64.alphabet alphabet).(canonic) in
-      Bytes.set output (off + input_len - 1) (Char.chr encoded) ;
+      let encoded = (Base64.alphabet alphabet).[canonic] in
+      Bytes.set output (off + input_len - 1) encoded ;
       (Bytes.unsafe_to_string output, off, normalized_len)
 
 let isomorphism0 (input, off, len) =
@@ -145,7 +144,7 @@ let range_of_max max : (int * int) gen =
   dynamic_bind (range (max / 2)) @@ fun off ->
   map [ range (max - off) ] (fun len -> (off, len))
 
-let failf fmt = Fmt.kstrf fail fmt
+let failf fmt = Fmt.kstr fail fmt
 
 let no_exception pad off len input =
   try

test/test.ml

@@ -269,7 +269,7 @@ let strict_base64_rfc2045_to_string x =
 let test_strict_with_malformed_input_rfc2045 =
   List.mapi
     (fun i (has, _) ->
-      Alcotest.test_case (Fmt.strf "strict rfc2045 - %02d" i) `Quick
+      Alcotest.test_case (Fmt.str "strict rfc2045 - %02d" i) `Quick
       @@ fun () ->
       try
         let _ = strict_base64_rfc2045_of_string has in
@@ -280,7 +280,7 @@ let test_strict_with_malformed_input_rfc2045 =
 let test_strict_rfc2045 =
   List.mapi
     (fun i (has, expect) ->
-      Alcotest.test_case (Fmt.strf "strict rfc2045 - %02d" i) `Quick
+      Alcotest.test_case (Fmt.str "strict rfc2045 - %02d" i) `Quick
       @@ fun () ->
       try
         let res0 = strict_base64_rfc2045_of_string has in
@@ -293,7 +293,7 @@ let test_strict_rfc2045 =
 let test_relaxed_rfc2045 =
   List.mapi
     (fun i (has, expect) ->
-      Alcotest.test_case (Fmt.strf "relaxed rfc2045 - %02d" i) `Quick
+      Alcotest.test_case (Fmt.str "relaxed rfc2045 - %02d" i) `Quick
       @@ fun () ->
       let res0 = relaxed_base64_rfc2045_of_string has in
       Alcotest.(check string) "decode(x)" res0 expect)