Merge pull request #120 from samoht/master

Update cohttp version constraints

Author: samoht

lib/memory.ml

@@ -22,9 +22,9 @@ let err_not_found n k =
   let str = Printf.sprintf "Git.Memory.%s: %s not found" n k in
   Lwt.fail (Invalid_argument str)
 
-module Make (D: SHA.DIGEST) = struct
+module Make (D: SHA.DIGEST) (I: Inflate.S) = struct
 
-  module Value_IO = Value.IO(D)(Inflate.None)
+  module Value_IO = Value.IO(D)(I)
 
   type t = {
     root    : string;
@@ -119,8 +119,8 @@ module Make (D: SHA.DIGEST) = struct
     in
     failwith str
 
-  module Pack_IO = Pack.IO(D)(Inflate.None)
-  module Packed_value_IO = Packed_value.IO(D)(Inflate.None)
+  module Pack_IO = Pack.IO(D)(I)
+  module Packed_value_IO = Packed_value.IO(D)(I)
 
   let write_pack t pack =
     Pack_IO.of_raw pack >>= fun pack ->
@@ -209,5 +209,5 @@ module Make (D: SHA.DIGEST) = struct
   let kind = `Memory
 
   module Digest = D
-  module Inflate = Inflate.None
+  module Inflate = I
 end

lib/memory.mli

@@ -16,7 +16,7 @@
 
 (** Store Git objects in memory. *)
 
-module Make (D: SHA.DIGEST): sig
+module Make (D: SHA.DIGEST) (I: Inflate.S): sig
 
   include Store.S
 

lib/mirage/git_mirage.ml

@@ -274,7 +274,6 @@ module Smart_HTTP = struct
   module Net = struct
     module IO = HTTP_IO
     type ctx = { resolver: Resolver_lwt.t; conduit: Conduit_mirage.t; }
-    let sexp_of_ctx { resolver; _ } = Resolver_lwt.sexp_of_t resolver
     let default_ctx = {
       resolver = Resolver_mirage.localhost;
       conduit = Conduit_mirage.empty;

lib/mirage/git_mirage.mli

@@ -33,10 +33,12 @@ module FS (FS: FS) (D: Git.SHA.DIGEST) (I: Git.Inflate.S): Git.FS.S
 
 module Sync: sig
   module IO: Git.Sync.IO with type ctx = Resolver_lwt.t * Conduit_mirage.t
+
   module Result:
     (module type of Git.Sync.Result with type fetch = Git.Sync.Result.fetch
                                      and type push  = Git.Sync.Result.push)
-  module Make  (D: Git.SHA.DIGEST) (I: Git.Inflate.S) (S: Git.Store.S):
+
+  module Make (S: Git.Store.S):
     Git.Sync.S with type t = S.t and type ctx = IO.ctx
 end
 

lib/sync.ml

@@ -307,9 +307,9 @@ module Result = struct
 
 end
 
-module Make (IO: IO) (D: SHA.DIGEST) (I: Inflate.S) (Store: Store.S) = struct
+module Make (IO: IO) (Store: Store.S) = struct
 
-  module SHA_IO = SHA.IO(D)
+  module SHA_IO = SHA.IO(Store.Digest)
 
   exception Error
 
@@ -878,7 +878,7 @@ module Make (IO: IO) (D: SHA.DIGEST) (I: Inflate.S) (Store: Store.S) = struct
 
   module Update_request = struct
 
-    module Pack_IO = Pack.IO(D)(I)
+    module Pack_IO = Pack.IO(Store.Digest)(Store.Inflate)
 
     type command =
       | Create of Reference.t * SHA.Commit.t
@@ -1000,7 +1000,7 @@ module Make (IO: IO) (D: SHA.DIGEST) (I: Inflate.S) (Store: Store.S) = struct
     | Fetch of fetch
 
   module Graph = Global_graph.Make(Store)
-  module Pack_IO = Pack.IO(D)(I)
+  module Pack_IO = Pack.IO(Store.Digest)(Store.Inflate)
 
   let push ?ctx t ~branch gri =
     Log.debug "Sync.push";

lib/sync.mli

@@ -177,5 +177,4 @@ module type IO = sig
 
 end
 
-module Make (IO: IO) (D: SHA.DIGEST) (I: Inflate.S) (S: Store.S):
-  S with type t = S.t and type ctx = IO.ctx
+module Make (IO: IO) (S: Store.S): S with type t = S.t and type ctx = IO.ctx

lib/unix/git_unix.ml

@@ -348,15 +348,15 @@ module Make (D: Git.SHA.DIGEST) (I: Git.Inflate.S) = struct
   module Sync = struct
     module IO = IO_Sync
     module Result = Sync.Result
-    module Make = Sync.Make(IO)(D)(I)
+    module Make = Sync.Make(IO)
   end
 
   module FS = struct
     module IO = IO_FS
     include Git.FS.Make(IO_FS)(D)(I)
   end
 
-  module Memory = Git.Memory.Make(D)
+  module Memory = Git.Memory.Make(D)(I)
 
   module SHA_IO = Git.SHA.IO(D)
   module Value_IO = Value.IO(D)(I)

lib_test/test_memory.ml

@@ -16,7 +16,7 @@
 
 open Test_store
 
-module Memory = Git.Memory.Make(Git_unix.SHA1)
+module Memory = Git.Memory.Make(Git_unix.SHA1)(Git_unix.Zlib)
 
 let init () =
   Git.Value.Cache.clear ();

opam

@@ -56,7 +56,7 @@ depopts: [
   "nocrypto"
 ]
 conflicts: [
- "cohttp"   {< "0.18.0" & >="0.19.0"}
+ "cohttp"   {< "0.19.1"}
  "conduit"  {< "0.8.4"}
  "alcotest" {< "0.4.0"}
  "camlzip"  {< "1.05"}