diff options
| author | Björn Gustavsson <[email protected]> | 2018-08-13 10:29:50 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2018-08-13 10:29:50 +0200 |
| commit | d255de157bbec36c25afaef33728e742a98f8eef (patch) | |
| tree | a1023bd57ec4cb383cdebfee257ee08793cb8079 /lib/stdlib | |
| parent | fc908292398d92ac4fe9840f70b9ee95125609dd (diff) | |
| parent | 1f89845db0b880b5b3599982223427cc16c411df (diff) | |
| download | otp-d255de157bbec36c25afaef33728e742a98f8eef.tar.gz otp-d255de157bbec36c25afaef33728e742a98f8eef.tar.bz2 otp-d255de157bbec36c25afaef33728e742a98f8eef.zip | |
Merge branch 'maint'
* maint:
Correct error behavior of is_map_key/2 in guards
Diffstat (limited to 'lib/stdlib')
| -rw-r--r-- | lib/stdlib/src/erl_internal.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/stdlib/src/erl_internal.erl b/lib/stdlib/src/erl_internal.erl index b311a843c2..939abaff00 100644 --- a/lib/stdlib/src/erl_internal.erl +++ b/lib/stdlib/src/erl_internal.erl @@ -74,6 +74,7 @@ guard_bif(element, 2) -> true; guard_bif(float, 1) -> true; guard_bif(floor, 1) -> true; guard_bif(hd, 1) -> true; +guard_bif(is_map_key, 2) -> true; guard_bif(length, 1) -> true; guard_bif(map_size, 1) -> true; guard_bif(map_get, 2) -> true; @@ -109,7 +110,6 @@ new_type_test(is_function, 2) -> true; new_type_test(is_integer, 1) -> true; new_type_test(is_list, 1) -> true; new_type_test(is_map, 1) -> true; -new_type_test(is_map_key, 2) -> true; new_type_test(is_number, 1) -> true; new_type_test(is_pid, 1) -> true; new_type_test(is_port, 1) -> true; |