Skip to content

Use mirage-kv instead of mirage-types #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
samoht merged 1 commit into from
Dec 28, 2016
Merged

Use mirage-kv instead of mirage-types #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _tags
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
true: annot, bin_annot
<src/**>: package(cmdliner unix)

<test/*>: package(bos cstruct lwt io-page io-page.unix mirage-types rresult)
<test/*>: package(bos cstruct lwt io-page io-page.unix mirage-kv-lwt rresult)
4 changes: 1 addition & 3 deletions opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@ depends: [
"bos" {test}
"cstruct" {test}
"lwt" {test}
"mirage-types" {test & >= "3.0.0"}
"mirage-types-lwt" {test & >= "3.0.0"}
"mirage-runtime" {test}
"mirage-kv-lwt" {test}
"io-page" {test}
"rresult" {test}
]
Expand Down
3 changes: 1 addition & 2 deletions pkg/pkg.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
open Topkg

let () =
let opams = [ Pkg.opam_file "opam" ~lint_deps_excluding:(Some ["mirage-types-lwt"]) ] in
Pkg.describe ~opams "crunch" @@ fun c ->
Pkg.describe "crunch" @@ fun c ->
Ok [ Pkg.mllib "src/crunch.mllib";
Pkg.bin "src/main" ~dst:"ocaml-crunch";
Pkg.test "test/test" ]
10 changes: 4 additions & 6 deletions src/crunch.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,9 @@ open Result

type t = unit

type error = V1.Kv_ro.error
type error = Mirage_kv.error

let pp_error = Mirage_pp.pp_kv_ro_error
let pp_error = Mirage_kv.pp_error

type 'a io = 'a Lwt.t

Expand Down Expand Up @@ -220,7 +220,5 @@ let disconnect () = return_unit

let output_lwt_skeleton_mli oc =
fprintf oc "
include V1.KV_RO
with type 'a io = 'a Lwt.t
and type page_aligned_buffer = Cstruct.t
val connect : unit -> t io"
include Mirage_kv_lwt.RO
val connect : unit -> t Lwt.t"
3 changes: 1 addition & 2 deletions test/test.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ let () =
OS.Dir.set_current (Fpath.v build_dir) >>= fun () ->
compile "main" "cmdliner" >>= fun () ->
crunch "t1" >>= fun () ->
compile "consumer"
"cstruct,lwt,lwt.unix,mirage-types,io-page.unix,io-page,mirage-runtime"
compile "consumer" "cstruct,lwt,lwt.unix,mirage-kv-lwt,io-page.unix,io-page"
>>= fun () ->

(* check that the compiled consumer exits successfully *)
Expand Down