diff options
| author | Hans Bolinder <[email protected]> | 2016-04-28 16:16:52 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2016-04-28 16:16:52 +0200 |
| commit | b6975497fc5d8e4b50c6a3237a2b24be0e2585c1 (patch) | |
| tree | 131ab66fe3dfb4023078ecbb14bf367a20eac70f /erts | |
| parent | ac2f1c71d5b5169d49a5cd5fd73d28a702a58024 (diff) | |
| parent | 457baf8eb9c5d6d5b1b46504e98a39e566aa4f58 (diff) | |
| download | otp-b6975497fc5d8e4b50c6a3237a2b24be0e2585c1.tar.gz otp-b6975497fc5d8e4b50c6a3237a2b24be0e2585c1.tar.bz2 otp-b6975497fc5d8e4b50c6a3237a2b24be0e2585c1.zip | |
Merge branch 'margnus1/dialyzer-maps/PR-1014'
* margnus1/dialyzer-maps/PR-1014: (24 commits)
doc: Correct shorthand typo
stdlib: Correct association types
stdlib: Add shadow comments for BIFs in maps
erts: Add exact association types to the abstract format doc
stdlib: Add pretty-printing of exact map types
stdlib: Correct a type in module epp
erl_types: Don't consider opaque keys singleton
erl_types: Fix t_subtract/2 correctness bug
erl_types: Fix crash merging maps with opaque keys
dialyzer_typesig: Fix bad external type
dialyzer: Fix another pattern literal bug
Bump Dialyzer version
dialyzer: Improve map pattern typesetting
dialyzer_contracts: Consider #{} a violation
dialyzer_typesig: Fix simplification bug
dialyzer_dataflow: Fix try in guards
dialyzer: Unfold cerl patterns containing maps
dialyzer_dataflow: Add map support
dialyzer_typesig: Add map support
Enhance map specs in erts, stdlib, runtime_tools
...
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/doc/src/absform.xml | 3 | ||||
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/erts/doc/src/absform.xml b/erts/doc/src/absform.xml index 13756ddfdc..6d6ba224a0 100644 --- a/erts/doc/src/absform.xml +++ b/erts/doc/src/absform.xml @@ -636,6 +636,9 @@ <item>If A is an association type <c>K => V</c>, where <c>K</c> and <c>V</c> are types, then Rep(A) = <c>{type,LINE,map_field_assoc,[Rep(K),Rep(V)]}</c>.</item> + <item>If A is an association type <c>K := V</c>, where + <c>K</c> and <c>V</c> are types, then Rep(A) = + <c>{type,LINE,map_field_exact,[Rep(K),Rep(V)]}</c>.</item> </list> </section> diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index 3cc17014ff..20a64e81b4 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -2257,9 +2257,9 @@ spawn_opt(_Tuple) -> Input :: non_neg_integer(), Output :: non_neg_integer(); (microstate_accounting) -> [MSAcc_Thread] | undefined when - MSAcc_Thread :: #{ type => MSAcc_Thread_Type, - id => MSAcc_Thread_Id, - counters => MSAcc_Counters}, + MSAcc_Thread :: #{ type := MSAcc_Thread_Type, + id := MSAcc_Thread_Id, + counters := MSAcc_Counters}, MSAcc_Thread_Type :: scheduler | async | aux, MSAcc_Thread_Id :: non_neg_integer(), MSAcc_Counters :: #{ MSAcc_Thread_State => non_neg_integer() }, |