Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adapt to coq/coq#19147 #421

Merged
merged 1 commit into from
Jun 24, 2024
Merged

adapt to coq/coq#19147 #421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion serapi/serapi_pp.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ let pp_feedback_content fmt fb =
| Custom(_loc, msg, _xml) -> fprintf fmt "Custom: %s" msg

(* Old generic messages *)
| Message(_lvl, _loc, m) -> fprintf fmt "Msg: @[%a@]" Pp.pp_with m
| Message(_lvl, _loc, _qf, m) -> fprintf fmt "Msg: @[%a@]" Pp.pp_with m

let pp_feedback fmt (fb : Feedback.feedback) =
let open Feedback in
Expand Down
8 changes: 4 additions & 4 deletions sertop/sertop_util.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ module F = Feedback
let feedback_content_pos_filter txt (fbc : F.feedback_content) : F.feedback_content =
let adjust _txt loc = loc in
match (fbc : F.feedback_content) with
| F.Message (lvl,loc,msg) -> F.Message (lvl, adjust txt loc, msg)
| F.Message (lvl,loc,qf,msg) -> F.Message (lvl, adjust txt loc, qf, msg)
| _ -> fbc

let feedback_pos_filter text (fb : F.feedback) : F.feedback =
Expand All @@ -60,7 +60,7 @@ let default_fb_filter_opts = {

let feedback_content_tr (fb : F.feedback_content) : Serapi.Serapi_protocol.feedback_content =
match fb with
| F.Message (level, loc, pp) ->
| F.Message (level, loc, _, pp) ->
let str = Pp.string_of_ppcmds pp in
Message { level; loc; pp; str }
| F.Processed -> Processed
Expand All @@ -84,9 +84,9 @@ let feedback_tr (fb : Feedback.feedback) : Serapi.Serapi_protocol.feedback =

let feedback_opt_filter ?(opts=default_fb_filter_opts) =
let open Feedback in function
| { F.contents = Message (lvl, loc, msg); _ } as fb ->
| { F.contents = Message (lvl, loc, qf, msg); _ } as fb ->
Some (if opts.pp_opt
then { fb with contents = Message(lvl, loc, coq_pp_opt msg) }
then { fb with contents = Message(lvl, loc, qf, coq_pp_opt msg) }
else fb)
| { F.contents = FileDependency _ ; _ } -> None
| fb -> Some fb
Loading