Skip to content

Update ocaml submodule #4706

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

Merged
merged 1 commit into from
Sep 18, 2020
Merged

Update ocaml submodule #4706

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
17 changes: 3 additions & 14 deletions lib/4.06.1/unstable/js_compiler.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54761,12 +54761,7 @@ let super_trace ppf =
fprintf ppf "Further expanded:@,"
end;
fprintf ppf
"@[<v>\
@[%a@]@,\
vs@,\
@[%a@]\
%a\
@]"
"@[<hov>%a@ vs@ %a@]%a"
(super_type_expansion ~tag:"error" t1) t1'
(super_type_expansion ~tag:"info" t2) t2'
(super_trace false) rem;
Expand All @@ -54790,14 +54785,8 @@ let super_unification_error unif tr txt1 ppf txt2 = begin
let tr = List.map prepare_expansion tr in
fprintf ppf
"@[<v 0>\
@[<v 2>\
%t@,\
@[<2>%a@]\
@]@,\
@[<v 2>\
%t@,\
@[<2>%a@]\
@]\
@[<hov 2>%t@ %a@]@,\
@[<hov 2>%t@ %a@]\
%a\
%t\
@]"
Expand Down
17 changes: 3 additions & 14 deletions lib/4.06.1/unstable/js_refmt_compiler.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54761,12 +54761,7 @@ let super_trace ppf =
fprintf ppf "Further expanded:@,"
end;
fprintf ppf
"@[<v>\
@[%a@]@,\
vs@,\
@[%a@]\
%a\
@]"
"@[<hov>%a@ vs@ %a@]%a"
(super_type_expansion ~tag:"error" t1) t1'
(super_type_expansion ~tag:"info" t2) t2'
(super_trace false) rem;
Expand All @@ -54790,14 +54785,8 @@ let super_unification_error unif tr txt1 ppf txt2 = begin
let tr = List.map prepare_expansion tr in
fprintf ppf
"@[<v 0>\
@[<v 2>\
%t@,\
@[<2>%a@]\
@]@,\
@[<v 2>\
%t@,\
@[<2>%a@]\
@]\
@[<hov 2>%t@ %a@]@,\
@[<hov 2>%t@ %a@]\
%a\
%t\
@]"
Expand Down
17 changes: 3 additions & 14 deletions lib/4.06.1/whole_compiler.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339647,12 +339647,7 @@ let super_trace ppf =
fprintf ppf "Further expanded:@,"
end;
fprintf ppf
"@[<v>\
@[%a@]@,\
vs@,\
@[%a@]\
%a\
@]"
"@[<hov>%a@ vs@ %a@]%a"
(super_type_expansion ~tag:"error" t1) t1'
(super_type_expansion ~tag:"info" t2) t2'
(super_trace false) rem;
Expand All @@ -339676,14 +339671,8 @@ let super_unification_error unif tr txt1 ppf txt2 = begin
let tr = List.map prepare_expansion tr in
fprintf ppf
"@[<v 0>\
@[<v 2>\
%t@,\
@[<2>%a@]\
@]@,\
@[<v 2>\
%t@,\
@[<2>%a@]\
@]\
@[<hov 2>%t@ %a@]@,\
@[<hov 2>%t@ %a@]\
%a\
%t\
@]"
Expand Down
2 changes: 1 addition & 1 deletion ocaml
Open in desktop
Submodule ocaml updated 1 files
+3 −14 typing/printtyp.ml