Skip to content

Commit

Permalink
Improve accuracy of maps:with eqWAlizer return type
Browse files Browse the repository at this point in the history 
Summary: When we explicitly specify atom keys in `maps:with` we should never end up with an open shape - the function keeps only the set of specified keys, for which we can always infer the best type based on both `props` and the open type.

Reviewed By: VLanvin

Differential Revision: D66546800

fbshipit-source-id: 5e9785dea3ea5ad3b0186bff3882aaf55a74dcd7
  • Loading branch information
@ruippeixotog @facebook-github-bot
ruippeixotog authored and facebook-github-bot committed Nov 28, 2024
1 parent 65fcf81 commit 30bcc2d
Show file tree
Hide file tree
Showing 3 changed files with 94 additions and 76 deletions.
146 changes: 73 additions & 73 deletions crates/elp/src/resources/test/eqwalizer_tests/check/custom.pretty
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1809,9 +1809,9 @@ See https://fb.me/eqwalizer_errors#incompatible_types
pid() is not compatible with number()

error: incompatible_types
┌─ check/src/custom.erl:2017:5
┌─ check/src/custom.erl:2035:5
│
2017 │ filename:join(["server", "erl"]).
2035 │ filename:join(["server", "erl"]).
│ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
│ │
│ filename:join([string_lit, string_lit]).
Expand All @@ -1828,9 +1828,9 @@ See https://fb.me/eqwalizer_errors#incompatible_types
string() | binary() is not compatible with string()

error: incompatible_types
┌─ check/src/custom.erl:2022:5
┌─ check/src/custom.erl:2040:5
│
2022 │ filename:join(["server", <<>>]).
2040 │ filename:join(["server", <<>>]).
│ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
│ │
│ filename:join([string_lit, <<..>>]).
Expand All @@ -1847,9 +1847,9 @@ See https://fb.me/eqwalizer_errors#incompatible_types
string() | binary() is not compatible with string()

error: incompatible_types
┌─ check/src/custom.erl:2027:5
┌─ check/src/custom.erl:2045:5
│
2027 │ filename:join([<<>>, ""]).
2045 │ filename:join([<<>>, ""]).
│ ^^^^^^^^^^^^^^^^^^^^^^^^^
│ │
│ filename:join([<<..>>, string_lit]).
Expand All @@ -1866,9 +1866,9 @@ See https://fb.me/eqwalizer_errors#incompatible_types
string() | binary() is not compatible with string()

error: incompatible_types
┌─ check/src/custom.erl:2042:5
┌─ check/src/custom.erl:2060:5
│
2042 │ filename:join([<<>>, <<>>]).
2060 │ filename:join([<<>>, <<>>]).
│ ^^^^^^^^^^^^^^^^^^^^^^^^^^^
│ │
│ filename:join([<<..>>, <<..>>]).
Expand All @@ -1885,9 +1885,9 @@ See https://fb.me/eqwalizer_errors#incompatible_types
string() is not compatible with binary()

error: incompatible_types
┌─ check/src/custom.erl:2057:19
┌─ check/src/custom.erl:2075:19
│
2057 │ filename:join([<<>>, self()]).
2075 │ filename:join([<<>>, self()]).
│ ^^^^^^^^^^^^^^
│ │
│ [<<..>>, erlang:self()].
Expand All @@ -1906,9 +1906,9 @@ See https://fb.me/eqwalizer_errors#incompatible_types
pid() is not compatible with string() | atom() | file:deep_list() | binary()

error: incompatible_types
┌─ check/src/custom.erl:2062:5
┌─ check/src/custom.erl:2080:5
│
2062 │ filename:join("server", "erl").
2080 │ filename:join("server", "erl").
│ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
│ │
│ filename:join(string_lit, string_lit).
Expand All @@ -1925,9 +1925,9 @@ See https://fb.me/eqwalizer_errors#incompatible_types
string() | binary() is not compatible with string()

error: incompatible_types
┌─ check/src/custom.erl:2067:5
┌─ check/src/custom.erl:2085:5
│
2067 │ filename:join("server", <<>>).
2085 │ filename:join("server", <<>>).
│ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
│ │
│ filename:join(string_lit, <<..>>).
Expand All @@ -1944,9 +1944,9 @@ See https://fb.me/eqwalizer_errors#incompatible_types
string() | binary() is not compatible with string()

error: incompatible_types
┌─ check/src/custom.erl:2072:5
┌─ check/src/custom.erl:2090:5
│
2072 │ filename:join(<<>>, "").
2090 │ filename:join(<<>>, "").
│ ^^^^^^^^^^^^^^^^^^^^^^^
│ │
│ filename:join(<<..>>, string_lit).
Expand All @@ -1963,9 +1963,9 @@ See https://fb.me/eqwalizer_errors#incompatible_types
string() | binary() is not compatible with string()

error: incompatible_types
┌─ check/src/custom.erl:2087:5
┌─ check/src/custom.erl:2105:5
│
2087 │ filename:join(atom, <<>>).
2105 │ filename:join(atom, <<>>).
│ ^^^^^^^^^^^^^^^^^^^^^^^^^
│ │
│ filename:join('atom', <<..>>).
Expand All @@ -1982,9 +1982,9 @@ See https://fb.me/eqwalizer_errors#incompatible_types
string() is not compatible with binary()

error: incompatible_types
┌─ check/src/custom.erl:2097:25
┌─ check/src/custom.erl:2115:25
│
2097 │ filename:join(<<>>, self()).
2115 │ filename:join(<<>>, self()).
│ ^^^^^^
│ │
│ erlang:self().
Expand All @@ -2001,12 +2001,12 @@ See https://fb.me/eqwalizer_errors#incompatible_types
pid() is not compatible with string()

error: incompatible_types
┌─ check/src/custom.erl:2126:5
┌─ check/src/custom.erl:2144:5
│
2126 │ ╭ ╭ queue:filter(
2127 │ │ │ fun my_filter1/1,
2128 │ │ │ Q
2129 │ │ │ ).
2144 │ ╭ ╭ queue:filter(
2145 │ │ │ fun my_filter1/1,
2146 │ │ │ Q
2147 │ │ │ ).
│ ╰─│─────^ queue:filter(my_filter1/1, Q).
Expression has type: queue:queue(atom() | number())
Context expected type: queue:queue(number())
Expand All @@ -2021,9 +2021,9 @@ See https://fb.me/eqwalizer_errors#incompatible_types
atom() is not compatible with number()

error: incompatible_types
┌─ check/src/custom.erl:2167:5
┌─ check/src/custom.erl:2185:5
│
2167 │ M3.
2185 │ M3.
│ ^^
│ │
│ M3.
Expand All @@ -2041,19 +2041,19 @@ See https://fb.me/eqwalizer_errors#incompatible_types
key `count` is declared as required in the latter but not in the former

error: incompatible_types
┌─ check/src/custom.erl:2199:13
┌─ check/src/custom.erl:2217:13
│
2199 │ Atom + Sum
2217 │ Atom + Sum
│ ^^^^ Atom.
Expression has type: atom()
Context expected type: number()

See https://fb.me/eqwalizer_errors#incompatible_types

error: incompatible_types
┌─ check/src/custom.erl:2243:5
┌─ check/src/custom.erl:2261:5
│
2243 │ Device.
2261 │ Device.
│ ^^^^^^
│ │
│ Device.
Expand All @@ -2070,9 +2070,9 @@ See https://fb.me/eqwalizer_errors#incompatible_types
pid() is not compatible with #file_descriptor{}

error: incompatible_types
┌─ check/src/custom.erl:2250:5
┌─ check/src/custom.erl:2268:5
│
2250 │ Device.
2268 │ Device.
│ ^^^^^^
│ │
│ Device.
Expand All @@ -2089,9 +2089,9 @@ See https://fb.me/eqwalizer_errors#incompatible_types
pid() is not compatible with #file_descriptor{}

error: incompatible_types
┌─ check/src/custom.erl:2269:5
┌─ check/src/custom.erl:2287:5
│
2269 │ maps:remove(A, M).
2287 │ maps:remove(A, M).
│ ^^^^^^^^^^^^^^^^^
│ │
│ maps:remove(A, M).
Expand All @@ -2104,15 +2104,15 @@ See https://fb.me/eqwalizer_errors#incompatible_types
key `a` is declared as required in the latter but not in the former

error: incompatible_types
┌─ check/src/custom.erl:2310:5
┌─ check/src/custom.erl:2328:5
│
2310 │ ╭ ╭ maps:filtermap(
2311 │ │ │ fun
2312 │ │ │ (a, V) -> true;
2313 │ │ │ (b, V) -> {true, atom_to_binary(V)};
2328 │ ╭ ╭ maps:filtermap(
2329 │ │ │ fun
2330 │ │ │ (a, V) -> true;
2331 │ │ │ (b, V) -> {true, atom_to_binary(V)};
· │ │
2316 │ │ │ M
2317 │ │ │ ).
2334 │ │ │ M
2335 │ │ │ ).
│ ╰─│─────^ maps:filtermap(fun, M).
Expression has type: #{a => atom() | binary(), b => atom() | binary(), c => atom() | binary()}
Context expected type: #{a := atom(), b := binary()}
Expand All @@ -2123,14 +2123,14 @@ See https://fb.me/eqwalizer_errors#incompatible_types
keys `a`, `b` are declared as required in the latter but not in the former

error: incompatible_types
┌─ check/src/custom.erl:2332:5
┌─ check/src/custom.erl:2350:5
│
2332 │ ╭ ╭ maps:filtermap(
2333 │ │ │ fun (_, V) ->
2334 │ │ │ {true, atom_to_binary(V)}
2335 │ │ │ end,
2336 │ │ │ M
2337 │ │ │ ).
2350 │ ╭ ╭ maps:filtermap(
2351 │ │ │ fun (_, V) ->
2352 │ │ │ {true, atom_to_binary(V)}
2353 │ │ │ end,
2354 │ │ │ M
2355 │ │ │ ).
│ ╰─│─────^ maps:filtermap(fun, M).
Expression has type: #{atom() => binary()}
Context expected type: #{atom() => atom()}
Expand All @@ -2144,9 +2144,9 @@ See https://fb.me/eqwalizer_errors#incompatible_types
binary() is not compatible with atom()

error: incompatible_types
┌─ check/src/custom.erl:2344:23
┌─ check/src/custom.erl:2362:23
│
2344 │ fun (_, _) -> err end,
2362 │ fun (_, _) -> err end,
│ ^^^
│ │
│ 'err'.
Expand All @@ -2161,39 +2161,39 @@ See https://fb.me/eqwalizer_errors#incompatible_types
'err' is not compatible with boolean()

error: incompatible_types
┌─ check/src/custom.erl:2353:45
┌─ check/src/custom.erl:2371:45
│
2353 │ fun (_, V) -> {true, atom_to_binary(V)} end,
2371 │ fun (_, V) -> {true, atom_to_binary(V)} end,
│ ^ V.
Expression has type: binary()
Context expected type: atom()

See https://fb.me/eqwalizer_errors#incompatible_types

error: incompatible_types
┌─ check/src/custom.erl:2367:5
┌─ check/src/custom.erl:2385:5
│
2367 │ re:replace(Subj, "+", "-", [{return, binary}]).
2385 │ re:replace(Subj, "+", "-", [{return, binary}]).
│ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ re:replace(Subj, string_lit, string_lit, [{'return', 'binary'}]).
Expression has type: binary()
Context expected type: string()

See https://fb.me/eqwalizer_errors#incompatible_types

error: incompatible_types
┌─ check/src/custom.erl:2371:5
┌─ check/src/custom.erl:2389:5
│
2371 │ re:replace(Subj, "+", "-", [{return, list}]).
2389 │ re:replace(Subj, "+", "-", [{return, list}]).
│ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ re:replace(Subj, string_lit, string_lit, [{'return', 'list'}]).
Expression has type: string()
Context expected type: binary()

See https://fb.me/eqwalizer_errors#incompatible_types

error: incompatible_types
┌─ check/src/custom.erl:2375:22
┌─ check/src/custom.erl:2393:22
│
2375 │ Res = re:replace(Subj, "+", "-", [{return, list}]),
2393 │ Res = re:replace(Subj, "+", "-", [{return, list}]),
│ ^^^^
│ │
│ Subj.
Expand All @@ -2208,9 +2208,9 @@ See https://fb.me/eqwalizer_errors#incompatible_types
atom() is not compatible with iodata()

error: incompatible_types
┌─ check/src/custom.erl:2380:38
┌─ check/src/custom.erl:2398:38
│
2380 │ Res = re:replace(Subj, "+", "-", [{return, something}]),
2398 │ Res = re:replace(Subj, "+", "-", [{return, something}]),
│ ^^^^^^^^^^^^^^^^^^^^^
│ │
│ [{'return', 'something'}].
Expand All @@ -2230,9 +2230,9 @@ See https://fb.me/eqwalizer_errors#incompatible_types
'something' is not compatible with 'iodata' | 'list' | 'binary'

error: incompatible_types
┌─ check/src/custom.erl:2496:5
┌─ check/src/custom.erl:2514:5
│
2496 │ lists:partition(fun is_number/1, L).
2514 │ lists:partition(fun is_number/1, L).
│ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
│ │
│ lists:partition(fun, L).
Expand All @@ -2250,9 +2250,9 @@ See https://fb.me/eqwalizer_errors#incompatible_types
number() is not compatible with atom()

error: incompatible_types
┌─ check/src/custom.erl:2508:5
┌─ check/src/custom.erl:2526:5
│
2508 │ lists:partition(fun({_Term, V}) -> is_number(V) end, L).
2526 │ lists:partition(fun({_Term, V}) -> is_number(V) end, L).
│ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
│ │
│ lists:partition(fun, L).
Expand All @@ -2273,9 +2273,9 @@ See https://fb.me/eqwalizer_errors#incompatible_types
number() is not compatible with atom()

error: incompatible_types
┌─ check/src/custom.erl:2526:5
┌─ check/src/custom.erl:2544:5
│
2526 │ lists:partition(fun({ok, _}) -> true; (_) -> false end, L).
2544 │ lists:partition(fun({ok, _}) -> true; (_) -> false end, L).
│ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
│ │
│ lists:partition(fun, L).
Expand All @@ -2296,9 +2296,9 @@ See https://fb.me/eqwalizer_errors#incompatible_types
{'ok', atom()} is not compatible with {'error', term()}

error: incompatible_types
┌─ check/src/custom.erl:2566:33
┌─ check/src/custom.erl:2584:33
│
2566 │ maps_intersect_2_neg(M1, M2) -> maps:intersect(M1, M2).
2584 │ maps_intersect_2_neg(M1, M2) -> maps:intersect(M1, M2).
│ ^^^^^^^^^^^^^^^^^^^^^^
│ │
│ maps:intersect(M1, M2).
Expand All @@ -2311,9 +2311,9 @@ See https://fb.me/eqwalizer_errors#incompatible_types
key `a` is declared as required in the latter but not in the former

error: incompatible_types
┌─ check/src/custom.erl:2576:33
┌─ check/src/custom.erl:2594:33
│
2576 │ maps_intersect_4_neg(M1, M2) -> maps:intersect(M1, M2).
2594 │ maps_intersect_4_neg(M1, M2) -> maps:intersect(M1, M2).
│ ^^^^^^^^^^^^^^^^^^^^^^
│ │
│ maps:intersect(M1, M2).
Expand All @@ -2331,9 +2331,9 @@ See https://fb.me/eqwalizer_errors#incompatible_types
number() is not compatible with 'true'

error: incompatible_types
┌─ check/src/custom.erl:2586:33
┌─ check/src/custom.erl:2604:33
│
2586 │ maps_intersect_6_neg(M1, M2) -> maps:intersect(M1, M2).
2604 │ maps_intersect_6_neg(M1, M2) -> maps:intersect(M1, M2).
│ ^^^^^^^^^^^^^^^^^^^^^^
│ │
│ maps:intersect(M1, M2).
Expand Down
2 changes: 1 addition & 1 deletion crates/elp/src/resources/test/eqwalizer_tests/check/gradual_custom.pretty
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ error: incompatible_types
187 │ │ Dyn
188 │ │ ).
│ ╰───^ maps:with(['a'], Dyn).
Expression has type: #{dynamic() => dynamic()}
Expression has type: #{a => dynamic()}
Context expected type: 'wrong_ret'

See https://fb.me/eqwalizer_errors#incompatible_types
Expand Down
Loading

0 comments on commit 30bcc2d

Please sign in to comment.