Skip to content

Commit 14d58df

Browse files
authored
Merge pull request #4693 from rescript-lang/fix_flush_err_formatter
Fix flush err_formatter
2 parents e4cd9b2 + 0e090cf commit 14d58df

File tree

7 files changed

+12
-7
lines changed

7 files changed

+12
-7
lines changed

darwin/ninja.exe

-12.2 KB
Binary file not shown.

jscomp/core/bs_conditional_initial.ml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,3 +70,5 @@ let setup_env () =
7070
; Switch.cut := 100 (* tweakable but not very useful *)
7171
#end
7272

73+
let () =
74+
at_exit (fun _ -> Format.pp_print_flush Format.err_formatter ())

jscomp/super_errors/super_location.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ let super_warning_printer loc ppf w =
8686
| `Inactive -> ()
8787
| `Active { Warnings. number = _; message = _; sub_locs = _} ->
8888
setup_colors ();
89-
Format.fprintf ppf "@[<v 2>@,%a@,%s@,@]@."
89+
Format.fprintf ppf "@[<v 2>@,%a@,%s@,@]"
9090
(print ("Warning number " ^ (Warnings.number w |> string_of_int)))
9191
loc
9292
(Warnings.message w);

lib/4.06.1/unstable/js_compiler.ml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81628,7 +81628,8 @@ let setup_env () =
8162881628
Lexer.replace_directive_string "BS_VERSION" Bs_version.version
8162981629

8163081630

81631-
81631+
let () =
81632+
at_exit (fun _ -> Format.pp_print_flush Format.err_formatter ())
8163281633
end
8163381634
module Ext_pervasives : sig
8163481635
#1 "ext_pervasives.mli"
@@ -409780,7 +409781,7 @@ let super_warning_printer loc ppf w =
409780409781
| `Inactive -> ()
409781409782
| `Active { Warnings. number = _; message = _; sub_locs = _} ->
409782409783
setup_colors ();
409783-
Format.fprintf ppf "@[<v 2>@,%a@,%s@,@]@."
409784+
Format.fprintf ppf "@[<v 2>@,%a@,%s@,@]"
409784409785
(print ("Warning number " ^ (Warnings.number w |> string_of_int)))
409785409786
loc
409786409787
(Warnings.message w);

lib/4.06.1/unstable/js_refmt_compiler.ml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81628,7 +81628,8 @@ let setup_env () =
8162881628
Lexer.replace_directive_string "BS_VERSION" Bs_version.version
8162981629

8163081630

81631-
81631+
let () =
81632+
at_exit (fun _ -> Format.pp_print_flush Format.err_formatter ())
8163281633
end
8163381634
module Ext_pervasives : sig
8163481635
#1 "ext_pervasives.mli"
@@ -569876,7 +569877,7 @@ let super_warning_printer loc ppf w =
569876569877
| `Inactive -> ()
569877569878
| `Active { Warnings. number = _; message = _; sub_locs = _} ->
569878569879
setup_colors ();
569879-
Format.fprintf ppf "@[<v 2>@,%a@,%s@,@]@."
569880+
Format.fprintf ppf "@[<v 2>@,%a@,%s@,@]"
569880569881
(print ("Warning number " ^ (Warnings.number w |> string_of_int)))
569881569882
loc
569882569883
(Warnings.message w);

lib/4.06.1/whole_compiler.ml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365478,7 +365478,8 @@ let setup_env () =
365478365478
Lexer.replace_directive_string "BS_VERSION" Bs_version.version
365479365479

365480365480

365481-
365481+
let () =
365482+
at_exit (fun _ -> Format.pp_print_flush Format.err_formatter ())
365482365483
end
365483365484
module Ext_spec : sig
365484365485
#1 "ext_spec.mli"
@@ -435340,7 +435341,7 @@ let super_warning_printer loc ppf w =
435340435341
| `Inactive -> ()
435341435342
| `Active { Warnings. number = _; message = _; sub_locs = _} ->
435342435343
setup_colors ();
435343-
Format.fprintf ppf "@[<v 2>@,%a@,%s@,@]@."
435344+
Format.fprintf ppf "@[<v 2>@,%a@,%s@,@]"
435344435345
(print ("Warning number " ^ (Warnings.number w |> string_of_int)))
435345435346
loc
435346435347
(Warnings.message w);

vendor/ninja.tar.gz

120 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)