Skip to content

Commit 3924543

Browse files
committed
analysis: get rid of PervasivesU
1 parent 1103e74 commit 3924543

File tree

3 files changed

+4
-12
lines changed

3 files changed

+4
-12
lines changed

analysis/src/CompletionBackEnd.ml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1320,14 +1320,8 @@ let getOpens ~debug ~rawOpens ~package ~env =
13201320
if debug && packageOpens <> [] then
13211321
Printf.printf "%s\n"
13221322
("Package opens "
1323-
^ String.concat " "
1324-
(packageOpens
1325-
|> List.map (fun p ->
1326-
p
1327-
|> List.map (fun name ->
1328-
(* Unify formatting between curried and uncurried *)
1329-
if name = "PervasivesU" then "Pervasives" else name)
1330-
|> pathToString)));
1323+
^ String.concat " " (packageOpens |> List.map (fun p -> p |> pathToString))
1324+
);
13311325
let resolvedOpens =
13321326
resolveOpens ~env (List.rev (rawOpens @ packageOpens)) ~package
13331327
in

analysis/src/Packages.ml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,7 @@ let newBsPackage ~rootPath =
134134
| None -> []
135135
in
136136
let opens =
137-
[(if uncurried then "PervasivesU" else "Pervasives"); "JsxModules"]
138-
:: opens_from_namespace
137+
["Pervasives"; "JsxModules"] :: opens_from_namespace
139138
|> List.rev_append opens_from_bsc_flags
140139
|> List.map (fun path -> path @ ["place holder"])
141140
in

analysis/src/TypeUtils.ml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -505,8 +505,7 @@ let getBuiltinFromTypePath path =
505505
| _ -> None)
506506
| Pdot (Pdot (Pident m, "Re", _), "t", _) when Ident.name m = "Js" ->
507507
Some RegExp
508-
| Pdot (Pident id, "result", _)
509-
when Ident.name id = "Pervasives" || Ident.name id = "PervasivesU" ->
508+
| Pdot (Pident id, "result", _) when Ident.name id = "Pervasives" ->
510509
Some Result
511510
| _ -> None
512511

0 commit comments

Comments
 (0)