Merge pull request #140 from avsm/cstruct-4

add support for cstruct 4 and optional sexp

Author: avsm

CHANGES.md

@@ -1,3 +1,7 @@
+## v2.0.1 (2019-03-26)
+
+* Use cstruct-sexp introduced in cstruct.4.0.0 (@avsm)
+
 ## v2.0.0 (2019-03-10)
 
 * Remove old `KV_RO` interface in the client as it has

lib/dune

@@ -1,7 +1,7 @@
 (library
  (name protocol_9p)
  (public_name protocol-9p)
- (libraries rresult cstruct sexplib lwt mirage-flow-lwt mirage-channel-lwt
+ (libraries rresult cstruct cstruct-sexp sexplib lwt mirage-flow-lwt mirage-channel-lwt
    astring fmt)
  (preprocess
   (pps ppx_sexp_conv)))

lib/protocol_9p_request.ml

@@ -298,7 +298,7 @@ module Write = struct
   type t = {
     fid: Fid.t;
     offset: int64;
-    data: Cstruct.t;
+    data: Cstruct_sexp.t;
   } [@@deriving sexp]
 
   let equal a b =

protocol-9p.opam

@@ -9,7 +9,8 @@ depends: [
   "ocaml" {>= "4.03.0"}
   "dune" {build & >= "1.0"}
   "base-bytes"
-  "cstruct" {>= "3.0.0"}
+  "cstruct" {>= "4.0.0"}
+  "cstruct-sexp"
   "sexplib" {> "113.00.00"}
   "rresult"
   "mirage-flow-lwt"
@@ -19,7 +20,7 @@ depends: [
   "fmt"
   "logs" {>= "0.5.0"}
   "win-error"
-  "ppx_sexp_conv"
+  "ppx_sexp_conv" {>="v0.9.0"}
   "alcotest" {with-test & >= "0.4.0"}
 ]
 build: [