remove rresult, also from unikernels

lzo/dune

@@ -1,12 +1,12 @@
 (test
   (name tests)
   (modules tests)
-  (libraries alcotest crowbar fmt bigstringaf decompress.lzo logs.fmt rresult)
+  (libraries alcotest crowbar fmt bigstringaf decompress.lzo logs.fmt)
 )
 
 ;(executable;
 ;  (public_name lzo-fuzzable)
 ;  (name lzo_fuzzable)
 ;  (modules lzo_fuzzable)
-;  (libraries afl-persistent lzo rresult)
+;  (libraries afl-persistent lzo)
 ;)

mirage-client/unikernel.ml

@@ -21,7 +21,7 @@ struct
 
   let read_config data =
     FS.get data (Mirage_kv.Key.v "openvpn.config") >|= function
-    | Error e -> Rresult.R.error_to_msg ~pp_error:FS.pp_error (Error e)
+    | Error e -> Error (`Msg (Fmt.to_to_string FS.pp_error e))
     | Ok data ->
         let string_of_file _ = Error (`Msg "not supported") in
         Miragevpn.Config.parse_client ~string_of_file data

mirage-nat/unikernel.ml

@@ -24,7 +24,7 @@ struct
 
   let read_config data =
     FS.get data (Mirage_kv.Key.v "openvpn.config") >|= function
-    | Error e -> Rresult.R.error_to_msg ~pp_error:FS.pp_error (Error e)
+    | Error e -> Error (`Msg (Fmt.to_to_string FS.pp_error e))
     | Ok data ->
         let string_of_file _ = Error (`Msg "not supported") in
         Miragevpn.Config.parse_client ~string_of_file data

mirage-router/unikernel.ml

@@ -64,7 +64,7 @@ struct
     in
     B.read block 0L data >|= function
     | Ok () -> Ok data
-    | Error e -> Rresult.R.error_msgf "%a" B.pp_error e
+    | Error e -> Error (`Msg (Fmt.to_to_string B.pp_error e))
 
   let read_config block =
     let open Lwt_result.Infix in

mirage-server/unikernel.ml

@@ -12,7 +12,7 @@ struct
 
   let read_config data =
     FS.get data (Mirage_kv.Key.v "openvpn.config") >|= function
-    | Error e -> Rresult.R.error_to_msg ~pp_error:FS.pp_error (Error e)
+    | Error e -> Error (`Msg (Fmt.to_to_string FS.pp_error e))
     | Ok data ->
         let string_of_file _ = Error (`Msg "no string_of_file support") in
         Miragevpn.Config.parse ~string_of_file data