diff --git a/lib/4.06.1/unstable/js_compiler.ml b/lib/4.06.1/unstable/js_compiler.ml index 1d0c2d0b36..d295cfe3d6 100644 --- a/lib/4.06.1/unstable/js_compiler.ml +++ b/lib/4.06.1/unstable/js_compiler.ml @@ -54761,12 +54761,7 @@ let super_trace ppf = fprintf ppf "Further expanded:@," end; fprintf ppf - "@[\ - @[%a@]@,\ - vs@,\ - @[%a@]\ - %a\ - @]" + "@[%a@ vs@ %a@]%a" (super_type_expansion ~tag:"error" t1) t1' (super_type_expansion ~tag:"info" t2) t2' (super_trace false) rem; @@ -54790,14 +54785,8 @@ let super_unification_error unif tr txt1 ppf txt2 = begin let tr = List.map prepare_expansion tr in fprintf ppf "@[\ - @[\ - %t@,\ - @[<2>%a@]\ - @]@,\ - @[\ - %t@,\ - @[<2>%a@]\ - @]\ + @[%t@ %a@]@,\ + @[%t@ %a@]\ %a\ %t\ @]" diff --git a/lib/4.06.1/unstable/js_refmt_compiler.ml b/lib/4.06.1/unstable/js_refmt_compiler.ml index 936fd10144..20563f06a8 100644 --- a/lib/4.06.1/unstable/js_refmt_compiler.ml +++ b/lib/4.06.1/unstable/js_refmt_compiler.ml @@ -54761,12 +54761,7 @@ let super_trace ppf = fprintf ppf "Further expanded:@," end; fprintf ppf - "@[\ - @[%a@]@,\ - vs@,\ - @[%a@]\ - %a\ - @]" + "@[%a@ vs@ %a@]%a" (super_type_expansion ~tag:"error" t1) t1' (super_type_expansion ~tag:"info" t2) t2' (super_trace false) rem; @@ -54790,14 +54785,8 @@ let super_unification_error unif tr txt1 ppf txt2 = begin let tr = List.map prepare_expansion tr in fprintf ppf "@[\ - @[\ - %t@,\ - @[<2>%a@]\ - @]@,\ - @[\ - %t@,\ - @[<2>%a@]\ - @]\ + @[%t@ %a@]@,\ + @[%t@ %a@]\ %a\ %t\ @]" diff --git a/lib/4.06.1/whole_compiler.ml b/lib/4.06.1/whole_compiler.ml index 2ef2d52168..f6fbc4abf0 100644 --- a/lib/4.06.1/whole_compiler.ml +++ b/lib/4.06.1/whole_compiler.ml @@ -339647,12 +339647,7 @@ let super_trace ppf = fprintf ppf "Further expanded:@," end; fprintf ppf - "@[\ - @[%a@]@,\ - vs@,\ - @[%a@]\ - %a\ - @]" + "@[%a@ vs@ %a@]%a" (super_type_expansion ~tag:"error" t1) t1' (super_type_expansion ~tag:"info" t2) t2' (super_trace false) rem; @@ -339676,14 +339671,8 @@ let super_unification_error unif tr txt1 ppf txt2 = begin let tr = List.map prepare_expansion tr in fprintf ppf "@[\ - @[\ - %t@,\ - @[<2>%a@]\ - @]@,\ - @[\ - %t@,\ - @[<2>%a@]\ - @]\ + @[%t@ %a@]@,\ + @[%t@ %a@]\ %a\ %t\ @]" diff --git a/ocaml b/ocaml index f5f1073b24..3a63cf28a8 160000 --- a/ocaml +++ b/ocaml @@ -1 +1 @@ -Subproject commit f5f1073b24f98efc39775e9a69dcbc97276827d4 +Subproject commit 3a63cf28a8a4e39bc9b301a9e1b8046c8ebc8f82