Merge remote-tracking branch 'jsoo/master' into jsoo-merge

.ocamlformat

@@ -10,5 +10,6 @@ break-separators=before
 dock-collection-brackets=false
 margin=90
 module-item-spacing=sparse
-version=0.26.2
+parse-docstrings=false
+version=0.27.0
 ocaml-version=4.08.0

benchmarks/common.ml

@@ -193,9 +193,9 @@ end = struct
         then fun x -> x
         else
           fun x ->
-          x
-          |> List.filter ~f:(fun nm -> Filename.check_suffix nm spec.ext)
-          |> List.map ~f:Filename.chop_extension)
+            x
+            |> List.filter ~f:(fun nm -> Filename.check_suffix nm spec.ext)
+            |> List.map ~f:Filename.chop_extension)
     |> List.sort ~cmp:compare
 
   let ml = create "ml" ".ml"

benchmarks/report.ml

@@ -160,8 +160,8 @@ let stats (h, t) =
 let escape_name_for_gnuplot s =
   let b = Buffer.create (String.length s) in
   String.iter s ~f:(function
-      | '_' -> Buffer.add_string b {|\\\_|}
-      | c -> Buffer.add_char b c);
+    | '_' -> Buffer.add_string b {|\\\_|}
+    | c -> Buffer.add_char b c);
   Buffer.contents b
 
 let text_output _no_header (h, t) =
@@ -291,9 +291,9 @@ let output_tables r conf =
       output_table
         r
         (List.map conf ~f:(function
-            | None -> read_blank_column ()
-            | Some (dir1, dir2, color, title, refe) ->
-                read_column ~title ~color dir1 (Spec.create dir2 "") refe))
+          | None -> read_blank_column ()
+          | Some (dir1, dir2, color, title, refe) ->
+              read_column ~title ~color dir1 (Spec.create dir2 "") refe))
         (output_function !no_header);
       no_header := true);
   close ()

benchmarks/run.ml

@@ -341,5 +341,5 @@ let _ =
   List.iter compilers ~f:(fun (comp, dir) ->
       measure param src (Filename.concat times dir) Spec.js comp;
       List.iter suites ~f:(function
-          | None -> ()
-          | Some suite -> measure param code (Filename.concat times dir) suite comp))
+        | None -> ()
+        | Some suite -> measure param code (Filename.concat times dir) suite comp))