Merge PR #11380: [exninfo] Deprecate aliases for exception re-raising.

Reviewed-by: Matafou
Reviewed-by: ppedrot

4 files changed, 7 insertions, 5 deletions

diff --git a/lib/cErrors.mli b/lib/cErrors.mli
index 1660a00244..ec81694177 100644
--- a/lib/cErrors.mli
+++ b/lib/cErrors.mli
@@ -14,7 +14,7 @@
 (** {6 Error handling} *)
 
 val push : exn -> Exninfo.iexn
-(** Alias for [Backtrace.add_backtrace]. *)
+[@@ocaml.deprecated "please use [Exninfo.capture]"]
 
 (** {6 Generic errors.}
 
diff --git a/lib/future.ml b/lib/future.ml
index ddf841b7fc..e8d232ad96 100644
--- a/lib/future.ml
+++ b/lib/future.ml
@@ -131,7 +131,7 @@ let rec compute ck : 'a value =
         let data = f () in
         c := Val data; `Val data
       with e ->
-        let e = CErrors.push e in
+        let e = Exninfo.capture e in
         let e = fix_exn e in
         match e with
         | (NotReady _, _) -> `Exn e
diff --git a/lib/system.ml b/lib/system.ml
index 2d68fd2fdf..9089eda564 100644
--- a/lib/system.ml
+++ b/lib/system.ml
@@ -248,9 +248,9 @@ let extern_state magic filename val_0 =
       marshal_out channel val_0;
       close_out channel
     with reraise ->
-      let reraise = CErrors.push reraise in
+      let reraise = Exninfo.capture reraise in
       let () = try_remove filename in
-      iraise reraise
+      Exninfo.iraise reraise
   with Sys_error s ->
     CErrors.user_err ~hdr:"System.extern_state" (str "System error: " ++ str s)
 
diff --git a/lib/util.mli b/lib/util.mli
index 2f1a03a19c..1417d6dfcb 100644
--- a/lib/util.mli
+++ b/lib/util.mli
@@ -119,8 +119,10 @@ val delayed_force : 'a delayed -> 'a
 (** {6 Enriched exceptions} *)
 
 type iexn = Exninfo.iexn
+[@@ocaml.deprecated "please use [Exninfo.iexn]"]
 
-val iraise : iexn -> 'a
+val iraise : Exninfo.iexn -> 'a
+[@@ocaml.deprecated "please use [Exninfo.iraise]"]
 
 (** {6 Misc. } *)