From 264aba2484312a2172cd36dd9b89ed66e4f38864 Mon Sep 17 00:00:00 2001
From: Gaëtan Gilbert
Date: Thu, 28 Jan 2021 16:36:07 +0100
Subject: Print anomaly labels regardless of -debug, and never print user_err
 labels

---
 lib/cErrors.ml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/cErrors.ml b/lib/cErrors.ml
index 760c07783b..1baedb64c9 100644
--- a/lib/cErrors.ml
+++ b/lib/cErrors.ml
@@ -30,6 +30,7 @@ let anomaly ?loc ?info ?label pp =
   let info = Option.cata (Loc.add_loc info) info loc in
   Exninfo.iraise (Anomaly (label, pp), info)
 
+(* TODO remove the option *)
 exception UserError of string option * Pp.t (* User errors *)
 
 let user_err ?loc ?info ?hdr strm =
@@ -46,7 +47,7 @@ exception Timeout = Control.Timeout
 let where = function
 | None -> mt ()
 | Some s ->
-  if !Flags.debug then str "in " ++ str s ++ str ":" ++ spc () else mt ()
+  str "in " ++ str s ++ str ":" ++ spc ()
 
 let raw_anomaly e = match e with
   | Anomaly (s, pps) ->
@@ -133,7 +134,7 @@ let print_no_report e = iprint_no_report (e, Exninfo.info e)
 
 let _ = register_handler begin function
   | UserError(s, pps) ->
-    Some (where s ++ pps)
+    Some pps
   | _ -> None
   end
 
-- 
cgit v1.2.3