From f67a3e115ef3b6ec0cbecef671cff613a2f55d91 Mon Sep 17 00:00:00 2001
From: Simon Cruanes <simon.cruanes.2007@m4x.org>
Date: Tue, 30 Sep 2014 17:12:02 +0200
Subject: [PATCH] fixed benchs/tests for 4.00

---
 _oasis                       | 2 +-
 benchs/bench_batch.ml        | 2 ++
 benchs/bench_conv.ml         | 1 +
 benchs/bench_hash.ml         | 2 +-
 tests/threads/test_future.ml | 6 +++---
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/_oasis b/_oasis
index 3c1b73f8..68d67f76 100644
--- a/_oasis
+++ b/_oasis
@@ -149,7 +149,7 @@ Executable benchs
   CompiledObject:   native
   Build$:           flag(bench)
   MainIs:           benchs.ml
-  BuildDepends:     containers,containers.string,containers.misc,bench
+  BuildDepends:     containers,containers.string,containers.misc,bench,containers.advanced
 
 Executable bench_conv
   Path:     benchs/
diff --git a/benchs/bench_batch.ml b/benchs/bench_batch.ml
index 1608cfb2..0e478e28 100644
--- a/benchs/bench_batch.ml
+++ b/benchs/bench_batch.ml
@@ -1,5 +1,7 @@
 (** benchmark CCBatch *)
 
+open Containers_advanced
+
 module type COLL = sig
   val name : string
   include CCBatch.COLLECTION
diff --git a/benchs/bench_conv.ml b/benchs/bench_conv.ml
index 6f7d39bd..c117fda8 100644
--- a/benchs/bench_conv.ml
+++ b/benchs/bench_conv.ml
@@ -78,6 +78,7 @@ let () =
   Printf.printf "list of 5 elements...\n";
   bench_list [1,2; 3,4; 5,6; 7,8; 9,10];
 
+  let open CCFun in
   let l = CCGen.(1 -- 100 |> map (fun x->x,x) |> to_rev_list) in
   Printf.printf "list of %d elements...\n" (List.length l);
   bench_list l;
diff --git a/benchs/bench_hash.ml b/benchs/bench_hash.ml
index c17f3969..c9d8c35f 100644
--- a/benchs/bench_hash.ml
+++ b/benchs/bench_hash.ml
@@ -28,7 +28,7 @@ let rec eq t1 t2 = match t1, t2 with
 let rec hash_tree t h = match t with
   | Empty -> CCHash.string_ "empty" h
   | Node (i, l) ->
-      h |> CCHash.string_ "node" |> CCHash.int_ i |> CCHash.list_ hash_tree l
+      CCHash.list_ hash_tree l (CCHash.int_ i (CCHash.string_ "node" h))
 
 module Box = Containers_misc.PrintBox
 
diff --git a/tests/threads/test_future.ml b/tests/threads/test_future.ml
index becf7f52..4c7bdf18 100644
--- a/tests/threads/test_future.ml
+++ b/tests/threads/test_future.ml
@@ -15,9 +15,9 @@ let test_mvar () =
   ()
 
 let test_parallel () =
-  let l = CCSequence.(1 -- 300)
-    |> CCSequence.map (fun _ -> Future.spawn (fun () -> Thread.delay 0.1; 1))
-    |> CCSequence.to_list in
+  let l = CCSequence.(1 -- 300) in
+  let l = CCSequence.map (fun _ -> Future.spawn (fun () -> Thread.delay 0.1; 1)) l in
+  let l = CCSequence.to_list l in
   let l' = List.map Future.get l in
   OUnit.assert_equal 300 (List.fold_left (+) 0 l');
   ()