diff options
| author | Pierre-Marie Pédrot | 2020-03-04 11:25:51 +0100 |
|---|---|---|
| committer | Pierre-Marie Pédrot | 2020-03-04 11:25:51 +0100 |
| commit | 89f111f2e15d8cab61495a419f0c9f7ae95e086a (patch) | |
| tree | 300ebf99c79fe0e91faf2ad50439b17916e60cf7 /ide | |
| parent | 2937fe5c1bb14a7cb7f00bb6e8d418ece00a7f50 (diff) | |
| parent | b2c58a23a1f71c86d8a64147923214b5059bd747 (diff) | |
Merge PR #11380: [exninfo] Deprecate aliases for exception re-raising.
Reviewed-by: Matafou
Reviewed-by: ppedrot
Diffstat (limited to 'ide')
| -rw-r--r-- | ide/idetop.ml | 4 | ||||
| -rw-r--r-- | ide/protocol/xmlprotocol.ml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ide/idetop.ml b/ide/idetop.ml index 9eb0b972b6..57e9792845 100644 --- a/ide/idetop.ml +++ b/ide/idetop.ml @@ -69,7 +69,7 @@ let ide_cmd_checks ~last_valid { CAst.loc; v } = let user_error s = try CErrors.user_err ?loc ~hdr:"IDE" (str s) with e -> - let (e, info) = CErrors.push e in + let (e, info) = Exninfo.capture e in let info = Stateid.add info ~valid:last_valid Stateid.dummy in Exninfo.iraise (e, info) in @@ -477,7 +477,7 @@ let print_xml = fun oc xml -> Mutex.lock m; try Control.protect_sigalrm (Xml_printer.print oc) xml; Mutex.unlock m - with e -> let e = CErrors.push e in Mutex.unlock m; iraise e + with e -> let e = Exninfo.capture e in Mutex.unlock m; Exninfo.iraise e let slave_feeder fmt xml_oc msg = let xml = Xmlprotocol.(of_feedback fmt msg) in diff --git a/ide/protocol/xmlprotocol.ml b/ide/protocol/xmlprotocol.ml index a2c80ea118..2e78642f2e 100644 --- a/ide/protocol/xmlprotocol.ml +++ b/ide/protocol/xmlprotocol.ml @@ -679,7 +679,7 @@ let abstract_eval_call : type a. _ -> a call -> a value = fun handler c -> | PrintAst x -> mkGood (handler.print_ast x) | Annotate x -> mkGood (handler.annotate x) with any -> - let any = CErrors.push any in + let any = Exninfo.capture any in Fail (handler.handle_exn any) (** brain dead code, edit if protocol messages are added/removed *) |