Clean up dependencies and upgrade dune.

Author: Jack Feser

CHANGES.md

@@ -1,3 +1,7 @@
+## 0.1.2 (2019-02-12)
+
+Update to dune 1.7 and clean up dependencies.
+
 ## 0.1.1 (2018-12-11)
 
 Fix bug where C memory was released prematurely.

cmph.opam

@@ -1,6 +1,6 @@
 opam-version: "1.2"
 name: "cmph"
-version: "0.1.1"
+version: "0.1.2"
 maintainer: "Jack Feser <[email protected]>"
 authors: "Jack Feser <[email protected]>"
 homepage: "https://github.com/jfeser/ocaml-cmph"
@@ -12,11 +12,10 @@ build: [
   ["dune" "build" "-p" name "-j" jobs]
 ]
 depends: [
-  "dune"           {build & >= "1.1"}
+  "dune"           {build & >= "1.7"}
   "ounit"          {test & >= "2.0" & < "2.1"}
   "ctypes"         {>= "0.14" & < "0.15"}
   "ctypes-foreign" {>= "0.4" & < "0.5"}
-  "base"           {>= "v0.11" & < "v0.12"}
-  "stdio"          {>= "v0.11" & < "v0.12"}
+  "core"           {>= "v0.11" & < "v0.12"}
   "ppx_sexp_conv"  {>= "v0.11" & < "v0.12"}
 ]

dune-project

@@ -1 +1,2 @@
-(lang dune 1.1)
+(lang dune 1.7)
+(name cmph)

lib/cmph.ml

@@ -3,8 +3,7 @@
 (* 3. Generate the hash function. *)
 (* 4. Export the hash function by dumping to a file or outputting as a buffer. *)
 
-open Base
-open Stdio
+open Core
 open Ctypes
 open Foreign
 module Util = Util

lib/dune

@@ -6,7 +6,7 @@
  (name cmph)
  (public_name cmph)
  (modules cmph util)
- (libraries base stdio ctypes ctypes.foreign)
+ (libraries core ctypes ctypes.foreign)
  (c_library_flags (:standard (:include flags) -lcmph))
  (preprocess (pps ppx_sexp_conv ppx_compare)))
 

lib/util.ml

@@ -1,24 +1,26 @@
-open Base
+open Core
 
 let with_output thunk =
   let old_stdout = Unix.(dup stdout) in
   let old_stderr = Unix.(dup stderr) in
-  let tmp_fn = Caml.Filename.temp_file "output" "log" in
-  let tmp_fd = Unix.(openfile tmp_fn [O_RDWR; O_CREAT; O_KEEPEXEC] 0o600) in
-  Unix.(dup2 tmp_fd stdout) ;
-  Unix.(dup2 tmp_fd stderr) ;
+  let tmp_fn = Filename.temp_file "output" "log" in
+  let tmp_fd =
+    Unix.(openfile tmp_fn ~mode:[O_RDWR; O_CREAT; O_KEEPEXEC] ~perm:0o600)
+  in
+  Unix.(dup2 ~src:tmp_fd ~dst:stdout) ;
+  Unix.(dup2 ~src:tmp_fd ~dst:stderr) ;
   let cleanup () =
-    Unix.(dup2 old_stdout stdout) ;
-    Unix.(dup2 old_stderr stderr) ;
+    Unix.(dup2 ~src:old_stdout ~dst:stdout) ;
+    Unix.(dup2 ~src:old_stderr ~dst:stderr) ;
     Unix.close old_stdout ;
     Unix.close old_stderr ;
-    assert (Unix.(lseek tmp_fd 0 SEEK_SET) = 0) ;
-    let tot_len = Unix.((fstat tmp_fd).st_size) in
+    assert (Unix.(lseek tmp_fd 0L ~mode:SEEK_SET) = 0L) ;
+    let tot_len = Unix.((fstat tmp_fd).st_size) |> Int.of_int64_exn in
     let buf = Bytes.create tot_len in
     let rec read_all ofs rem_len =
       if rem_len <= 0 then ()
       else
-        let read_len = Unix.read tmp_fd buf ofs rem_len in
+        let read_len = Unix.read tmp_fd ~buf ~pos:ofs ~len:rem_len in
         let ofs = ofs + read_len in
         let rem_len = rem_len - read_len in
         read_all ofs rem_len

test/dune

@@ -1,5 +1,5 @@
 (executables
- (names vector test)
+ (names test)
  (libraries oUnit cmph))
 
 (alias

test/test.ml

@@ -1,5 +1,4 @@
-open Base
-open Stdio
+open Core
 open OUnit2
 open Cmph
 open Util