Merge pull request #15 from avsm/errata-1

Errata 1 for latest Core/Async

Author: yminsky-janestreet

INSTALL.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-opam install --yes \
+opam install -j 4 --yes \
   core \
   core_extended \
   cryptokit \
@@ -16,7 +16,8 @@ opam install --yes \
   cmdliner \
   cow \
   ocp-indent \
-  ctypes
+  ctypes \
+  ocp-index
 
 echo You also need Pygments installed.
 echo This is python-pygments in Debian

code/async/search.ml

@@ -28,7 +28,7 @@ let get_definition_from_json json =
 let get_definition word =
   Cohttp_async.Client.get (query_uri word)
   >>= fun (_, body) ->
-  Pipe.to_list body
+  Pipe.to_list (Cohttp_async.Body.to_pipe body)
   >>| fun strings ->
   (word, get_definition_from_json (String.concat strings))
 

code/async/search_with_error_handling.ml

@@ -30,7 +30,7 @@ let get_definition ~server word =
   try_with (fun () ->
     Cohttp_async.Client.get (query_uri ~server word)
     >>= fun  (_, body) ->
-    Pipe.to_list body
+    Pipe.to_list (Cohttp_async.Body.to_pipe body)
     >>| fun strings ->
     (word, get_definition_from_json (String.concat strings)))
   >>| function

code/async/search_with_timeout_no_leak.ml

@@ -29,7 +29,7 @@ let get_definition ~server ~interrupt word =
   try_with (fun () ->
     Cohttp_async.Client.get ~interrupt (query_uri ~server word)
     >>= fun  (_, body) ->
-    Pipe.to_list body
+    Pipe.to_list (Cohttp_async.Body.to_pipe body)
     >>| fun strings ->
     (word, get_definition_from_json (String.concat strings)))
   >>| function

code/async/test.txt

@@ -1 +1 @@
-THIS IS ONLY A TEST.
+This is only a test.

code/ffi/datetime.ml

@@ -16,8 +16,8 @@ let ()       = seal timeval
 type timezone
 let timezone : timezone structure typ = structure "timezone"
 
-let gettimeofday = foreign "gettimeofday"
-    (ptr timeval @-> ptr timezone @-> returning_checking_errno int)
+let gettimeofday = foreign "gettimeofday" ~check_errno:true
+    (ptr timeval @-> ptr timezone @-> returning int)
 
 let time' () = time (from_voidp time_t null)
 

code/gc/run_barrier_bench.sh

@@ -1,2 +1,2 @@
 corebuild -pkg core_bench barrier_bench.native
-./barrier_bench.native -ascii name alloc
+./barrier_bench.native -ascii alloc

code/maps-and-hash-tables/run_map_vs_hash.sh

@@ -1,2 +1,2 @@
 corebuild -pkg core_bench map_vs_hash.native
-./map_vs_hash.native -ascii -clear-columns name time speedup
+./map_vs_hash.native -ascii -clear-columns time speedup

code/maps-and-hash-tables/run_map_vs_hash2.sh

@@ -1,2 +1,2 @@
 corebuild -pkg core_bench map_vs_hash2.native
-./map_vs_hash2.native -ascii -clear-columns name time speedup
+./map_vs_hash2.native -ascii -clear-columns time speedup