Merge pull request #77 from hannesm/no-result

remove open Result

.travis.yml

@@ -8,7 +8,7 @@ env:
   - PINS="fat-filesystem:."
   - DISTRO="debian-stable"
   matrix:
-  - PACKAGE="fat-filesystem" OCAML_VERSION="4.03.0"
-  - PACKAGE="fat-filesystem" OCAML_VERSION="4.04.2"
-  - PACKAGE="fat-filesystem" OCAML_VERSION="4.05.0"
-  - PACKAGE="fat-filesystem" OCAML_VERSION="4.06.0"
+  - PACKAGE="fat-filesystem" OCAML_VERSION="4.03"
+  - PACKAGE="fat-filesystem" OCAML_VERSION="4.04"
+  - PACKAGE="fat-filesystem" OCAML_VERSION="4.05"
+  - PACKAGE="fat-filesystem" OCAML_VERSION="4.06"

bin/impl.ml

@@ -14,7 +14,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *)
 open Lwt.Infix
-open Result
 open Mirage_fs
 
 module Filesystem = Fat.FS(Block)
@@ -31,11 +30,11 @@ let (>>*=) m f = m >>= function
   | Ok x    -> f x
 
 let rec iter_s f = function
-  | [] -> Lwt.return (Result.Ok ())
+  | [] -> Lwt.return (Ok ())
   | x :: xs ->
     f x >>= function
-    | Result.Error e -> Lwt.return (Result.Error e)
-    | Result.Ok () -> iter_s f xs
+    | Error e -> Lwt.return (Error e)
+    | Ok () -> iter_s f xs
 
 let alloc bytes =
   let pages = Io_page.(to_cstruct (get ((bytes + 4095) / 4096))) in
@@ -65,8 +64,8 @@ let copy_file_in fs outside inside =
            let frag = Cstruct.sub block 0 this in
            Block.really_read ifd frag >>= fun () ->
            Filesystem.write fs inside offset frag >>= function
-           | Result.Ok () -> loop (offset + this) (remaining - this)
-           | Result.Error e ->
+           | Ok () -> loop (offset + this) (remaining - this)
+           | Error e ->
              let b = Buffer.create 20 in
              let ppf = Format.formatter_of_buffer b in
              let k ppf =

bin/shell.ml

@@ -1,7 +1,6 @@
 (* This is a toplevel-like test program *)
 open Lwt.Infix
 open Mirage_fs
-open Result
 
 module Test = Fat.FS(Block)
 

fat-filesystem.opam

@@ -15,7 +15,6 @@ depends: [
   "cstruct" {>= "3.0.0"}
   "ppx_tools" {build}
   "ppx_cstruct" {build}
-  "result"
   "rresult"
   "lwt" {>= "2.4.3"}
   "mirage-fs" {>= "1.0.0"}

src/fat.mli

@@ -34,6 +34,6 @@ module FS (B: Mirage_block_lwt.S): sig
   ]
   include Mirage_fs_lwt.S with type error := error and type write_error := write_error
   val connect : B.t -> t Lwt.t
-  val format : B.t -> int64 -> (t, write_error) Result.result Lwt.t
+  val format : B.t -> int64 -> (t, write_error) result Lwt.t
 
 end

src/fat_boot_sector.ml

@@ -14,8 +14,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *)
 
-open Result
-
 type t = {
   oem_name: string;
   bytes_per_sector: int; (* usually 512 *)

src/fat_boot_sector.mli

@@ -14,8 +14,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *)
 
-open Result
-
 type t = {
   oem_name: string;
   bytes_per_sector: int;
@@ -49,7 +47,7 @@ val sectors_of_cluster: t -> int -> int list
 val clusters: t -> int
 (** Return the number of clusters *)
 
-val detect_format: t -> (Fat_format.t, string) Result.result
+val detect_format: t -> (Fat_format.t, string) result
 (* Choose between FAT12, FAT16 and FAT32 using heuristic from:
    http://averstak.tripod.com/fatdox/bootsec.htm *)
 

src/fat_fs.ml

@@ -17,7 +17,6 @@
 open Lwt.Infix
 open Mirage_block
 open Mirage_fs
-open Result
 
 type fs = {
   boot  : Fat_boot_sector.t;

src/fat_fs.mli

@@ -33,6 +33,6 @@ module Make (B: Mirage_block_lwt.S): sig
      and type write_error := write_error
 
   val connect : B.t -> t Lwt.t
-  val format : B.t -> int64 -> (t, write_error) Result.result Lwt.t
+  val format : B.t -> int64 -> (t, write_error) result Lwt.t
 
 end

test/test.ml

@@ -16,7 +16,6 @@
 
 open Lwt.Infix
 open Block
-open Result
 open Mirage_fs
 
 module MemFS = Fat.FS(Mirage_block_lwt.Mem)