Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions jscomp/gentype/TranslateTypeExprFromTypes.ml
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ let translate_constr ~config ~params_translation ~(path : Path.t) ~type_env =
{param_translation with type_ = Array (param_translation.type_, Mutable)}
| ["ImmutableArray"; "t"], [param_translation] ->
{param_translation with type_ = Array (param_translation.type_, Immutable)}
| [("Pervasives" | "PervasivesU"); "ref"], [param_translation] ->
| ["Pervasives"; "ref"], [param_translation] ->
{
dependencies = param_translation.dependencies;
type_ =
Expand Down Expand Up @@ -217,7 +217,7 @@ let translate_constr ~config ~params_translation ~(path : Path.t) ~type_env =
| ( ( ["React"; "element"]
| ["ReactV3"; "React"; "element"]
| ["ReasonReact"; "reactElement"]
| [("Pervasives" | "PervasivesU"); "Jsx"; "element"] ),
| ["Pervasives"; "Jsx"; "element"] ),
[] ) ->
{dependencies = []; type_ = EmitType.type_react_element}
| (["FB"; "option"] | ["option"]), [param_translation] ->
Expand Down
3 changes: 1 addition & 2 deletions jscomp/ml/printtyp.ml
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,10 @@ let ident ppf id = pp_print_string ppf (ident_name id)
(* Print a path *)

let ident_pervasives = Ident.create_persistent "Pervasives"
let ident_pervasives_u = Ident.create_persistent "PervasivesU"
let printing_env = ref Env.empty
let non_shadowed_pervasive = function
| Pdot(Pident id, s, _pos) as path ->
(Ident.same id ident_pervasives || Ident.same id ident_pervasives_u) &&
(Ident.same id ident_pervasives) &&
(try Path.same path (Env.lookup_type (Lident s) !printing_env)
with Not_found -> true)
| _ -> false
Expand Down
321 changes: 0 additions & 321 deletions jscomp/stdlib-406/pervasivesU.res

This file was deleted.

Loading