Merge pull request #8 from samoht/result

Remove `open Result`
mirage · Jun 29, 2017 · e7c9b7a · e7c9b7a
2 parents a593aa4 + 50c6667
commit e7c9b7a
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 49 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,9 +4,8 @@ install: wget https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/.t
 script: bash -ex .travis-opam.sh
 env:
   global:
-  - EXTRA_REMOTES="https://github.com/mirage/mirage-dev.git"
-  - PINS="mirage-kv.1.0.0:. mirage-kv-lwt.1.0.0:."
+  - PINS="mirage-kv.dev:. mirage-kv-lwt.dev:."
   matrix:
-  - OCAML_VERSION=4.02 PACKAGE="mirage-kv-lwt"
   - OCAML_VERSION=4.03 PACKAGE="mirage-kv-lwt"
   - OCAML_VERSION=4.04 PACKAGE="mirage-kv-lwt"
+  - OCAML_VERSION=4.05 PACKAGE="mirage-kv-lwt"
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,9 +1,11 @@
-v1.1.0 2017-05-26
------------------
+### v1.1.1 (2017-06-29)
+
+* Remove `open Result` statements (and drop support to 4.02)
+
+### v1.1.0 (2017-05-26)
 
 * Port to Jbuilder.
 
-v1.0.0 2016-12-27
-----------------
+### v1.0.0 (2016-12-27)
 
-First release, import `V1.KV_RO` and `V1_LWT.KV_RO` from mirage-types.
+* First release, import `V1.KV_RO` and `V1_LWT.KV_RO` from mirage-types.
diff --git a/Makefile b/Makefile
@@ -1,17 +1,10 @@
-
 .PHONY: build clean test
 
 build:
-	jbuilder build @install
+	jbuilder build --dev
 
 test:
-	jbuilder runtest
-
-install:
-	jbuilder install
-
-uninstall:
-	jbuilder uninstall
+	jbuilder runtest --dev
 
 clean:
-	rm -rf _build
+	jbuilder clean
diff --git a/lwt/.merlin b/lwt/.merlin
diff --git a/mirage-kv-lwt.opam b/mirage-kv-lwt.opam
@@ -14,7 +14,7 @@ build: [
 ]
 
 depends: [
-  "jbuilder" {build & >="1.0+beta7"}
+  "jbuilder" {build & >="1.0+beta10"}
   "mirage-kv" {>= "1.0.0"}
   "lwt"
   "cstruct" {>= "1.9.0"}

diff --git a/mirage-kv.opam b/mirage-kv.opam
@@ -14,9 +14,9 @@ build: [
 ]
 
 depends: [
-  "jbuilder" {build & >="1.0+beta7"}
+  "jbuilder" {build & >="1.0+beta10"}
   "mirage-device" {>= "1.0.0"}
   "fmt"
 ]
 
-available: [ ocaml-version >= "4.01.0"]
+available: [ ocaml-version >= "4.03.0"]
diff --git a/src/.merlin b/src/.merlin
diff --git a/src/mirage_kv.ml b/src/mirage_kv.ml
@@ -16,8 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *)
 
-open Result
-
 type error = [`Unknown_key of string]
 
 let pp_error ppf = function

diff --git a/src/mirage_kv.mli b/src/mirage_kv.mli
@@ -20,8 +20,6 @@
 
     {e %%VERSION%% } *)
 
-open Result
-
 (** {1 Mirage_kv} *)
 
 type error = [`Unknown_key of string]