From 8be2b453a73970cf2523ad0d7871b7e6d8ed7724 Mon Sep 17 00:00:00 2001
From: Michele Alberti <michele.alberti@cea.fr>
Date: Wed, 6 Mar 2024 12:39:29 +0100
Subject: [PATCH] [logging] Rework API with respect to src parameter.
---
src/logging.ml | 10 +++++-----
src/logging.mli | 5 ++---
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/logging.ml b/src/logging.ml
index 582d008..48652af 100644
--- a/src/logging.ml
+++ b/src/logging.ml
@@ -73,8 +73,8 @@ let setup style_renderer level srcs =
exception Code_error
-let code_error ?src f =
- Logs.err ?src (fun m ->
+let code_error ~src f =
+ Logs.err ~src (fun m ->
let report_with_msg ?header:_ ?tags:_ fmt =
m
("@[<v>" ^^ fmt
@@ -86,11 +86,11 @@ let code_error ?src f =
exception User_error
-let user_error ?src ?loc f =
+let user_error ?loc f =
(match loc with
- | None -> Logs.err ?src f
+ | None -> Logs.err f
| Some loc ->
- Logs.err ?src (fun m ->
+ Logs.err (fun m ->
let report_with_loc ?header:_ ?tags:_ fmt =
m ("@[%a:@ " ^^ fmt ^^ "@]") Why3.Loc.pp_position loc
in
diff --git a/src/logging.mli b/src/logging.mli
index 1722e73..6410b1a 100644
--- a/src/logging.mli
+++ b/src/logging.mli
@@ -39,11 +39,10 @@ val setup :
val is_debug_level : Logs.src -> bool
-val code_error : ?src:Logs.src -> (_, unit) Logs.msgf -> 'b
+val code_error : src:Logs.src -> (_, unit) Logs.msgf -> 'b
(** Terminate execution with a [code error] message. *)
-val user_error :
- ?src:Logs.src -> ?loc:Why3.Loc.position -> (_, unit) Logs.msgf -> 'b
+val user_error : ?loc:Why3.Loc.position -> (_, unit) Logs.msgf -> 'b
(** Terminate execution with a [user error] message. *)
val not_implemented_yet : ?src:Logs.src -> (_, unit) Logs.msgf -> 'b
--
GitLab