From fe435ce1146a3f6f1f7685372d0170301b5fd1f1 Mon Sep 17 00:00:00 2001
From: Benjamin Canou <benjamin@canou.fr>
Date: Wed, 23 May 2018 23:26:47 +0200
Subject: [PATCH] Client: minor error printing tweaks

---
 src/lib_client_base_unix/client_main_run.ml | 6 ++++--
 src/lib_error_monad/error_monad.ml          | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/lib_client_base_unix/client_main_run.ml b/src/lib_client_base_unix/client_main_run.ml
index cea116224..a19cb62d9 100644
--- a/src/lib_client_base_unix/client_main_run.ml
+++ b/src/lib_client_base_unix/client_main_run.ml
@@ -143,10 +143,12 @@ let main select_commands =
         Format.eprintf "@{<error>@{<title>Fatal error@}@} unknown protocol version.@." ;
         Lwt.return 1
     | Failure message ->
-        Format.eprintf "@{<error>@{<title>Fatal error@}@} %s.@." message ;
+        Format.eprintf "@{<error>@{<title>Fatal error@}@} @[<hov 0>%a@]@."
+          Format.pp_print_text message ;
         Lwt.return 1
     | exn ->
-        Format.printf "@{<error>@{<title>Fatal error@}@} %s.@." (Printexc.to_string exn) ;
+        Format.printf "@{<error>@{<title>Fatal error@}@} @[<hov 0>%a@]@."
+          Format.pp_print_text (Printexc.to_string exn) ;
         Lwt.return 1
   end >>= fun retcode ->
   Format.pp_print_flush Format.err_formatter () ;
diff --git a/src/lib_error_monad/error_monad.ml b/src/lib_error_monad/error_monad.ml
index c3bd0998d..ee254090c 100644
--- a/src/lib_error_monad/error_monad.ml
+++ b/src/lib_error_monad/error_monad.ml
@@ -124,7 +124,7 @@ module Make(Prefix : sig val id : string end) = struct
             (req "kind" (constant "generic"))
             (req "error" string)))
         from_error to_error in
-    let pp = Format.pp_print_string in
+    let pp ppf s = Format.fprintf ppf "@[<h 0>%a@]" Format.pp_print_text s in
     error_kinds :=
       Error_kind { id ; title ; description ;
                    from_error ; category ; encoding_case ; pp } :: !error_kinds
@@ -603,7 +603,7 @@ let () =
     ~id:"failure"
     ~title:"Generic error"
     ~description:"Unclassified error"
-    ~pp:Format.pp_print_string
+    ~pp:(fun ppf s -> Format.fprintf ppf "@[<h 0>%a@]" Format.pp_print_text s)
     Data_encoding.(obj1 (req "msg" string))
     (function
       | Exn (Failure msg) -> Some msg