Skip to content

Commit

Permalink
Merge pull request #3 from hannesm/easy
Browse files Browse the repository at this point in the history
adapt to mirage-kv 3.0.0 API
  • Loading branch information
hannesm authored Oct 30, 2019
2 parents bcf8bd9 + 3a23afd commit e2bf18a
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 13 deletions.
13 changes: 9 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
language: c
install: wget https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/.travis-opam.sh
script: bash -ex .travis-opam.sh
sudo: required
install: wget https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/.travis-docker.sh
script: bash -ex .travis-docker.sh
sudo: false
services:
- docker
env:
global:
- PACKAGE="mirage-kv-mem"
- DISTRO=alpine
- TESTS=true
matrix:
- OCAML_VERSION=4.05
- OCAML_VERSION=4.06
- OCAML_VERSION=4.07
- OCAML_VERSION=4.08
- OCAML_VERSION=4.09
notifications:
email: false
10 changes: 5 additions & 5 deletions mirage-kv-mem.opam
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@ build: [
]

depends: [
"ocaml" {>= "4.05.0"}
"dune"
"ocaml" {>= "4.06.0"}
"dune" {>= "1.3.0"}
"alcotest" {with-test}
"ppx_deriving" {with-test}
"mirage-clock" {>= "2.0.0"}
"mirage-kv-lwt" {>= "2.0.0"}
"mirage-clock" {>= "3.0.0"}
"mirage-kv" {>= "3.0.0"}
"rresult"
"fmt"
"ptime"
"mirage-clock-unix" {>= "2.0.0"}
"mirage-clock-unix" {>= "3.0.0"}
]

synopsis: "In-memory key value store for MirageOS"
Expand Down
2 changes: 1 addition & 1 deletion src/dune
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(library
(name mirage_kv_mem)
(public_name mirage-kv-mem)
(libraries mirage-kv-lwt rresult fmt ptime mirage-clock))
(libraries mirage-kv rresult fmt ptime mirage-clock))
2 changes: 0 additions & 2 deletions src/mirage_kv_mem.ml
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,6 @@ module Pure = struct
end

module Make (CLOCK : Mirage_clock.PCLOCK) = struct
type +'a io = 'a Lwt.t
type value = string
type key = Mirage_kv.Key.t

[@@@warning "-34"]
Expand Down
2 changes: 1 addition & 1 deletion src/mirage_kv_mem.mli
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ module Make (Clock : Mirage_clock.PCLOCK) : sig
type nonrec error = error
type nonrec write_error = write_error

include Mirage_kv_lwt.RW
include Mirage_kv.RW
with type write_error := write_error
and type error := error

Expand Down

0 comments on commit e2bf18a

Please sign in to comment.