diff options
author | Hans Bolinder <[email protected]> | 2016-06-10 08:23:26 +0200 |
---|---|---|
committer | Hans Bolinder <[email protected]> | 2016-06-10 08:23:26 +0200 |
commit | 77e69343b8bf6de63242cbcea7ebb35be3bb99e9 (patch) | |
tree | 5954533b7d1221aec75067cb1a56cda6350b16a7 /lib/edoc/src/edoc_layout.erl | |
parent | 68ff9f3e4b5387cf38af7aeb1a8b7abbdaa867d8 (diff) | |
parent | af761914c9a94a9d54c1bcc2d4fff96a58674078 (diff) | |
download | otp-77e69343b8bf6de63242cbcea7ebb35be3bb99e9.tar.gz otp-77e69343b8bf6de63242cbcea7ebb35be3bb99e9.tar.bz2 otp-77e69343b8bf6de63242cbcea7ebb35be3bb99e9.zip |
Merge branch 'hasse/no_dots_in_map_types/PR-1014'
* hasse/no_dots_in_map_types/PR-1014:
Remove support for '...' in Maps types
Diffstat (limited to 'lib/edoc/src/edoc_layout.erl')
-rw-r--r-- | lib/edoc/src/edoc_layout.erl | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/lib/edoc/src/edoc_layout.erl b/lib/edoc/src/edoc_layout.erl index e86d090b13..ef57b7b084 100644 --- a/lib/edoc/src/edoc_layout.erl +++ b/lib/edoc/src/edoc_layout.erl @@ -901,17 +901,11 @@ t_map(Es) -> t_map_field(#xmlElement{content = [K,V]}=E) -> KElem = t_utype_elem(K), VElem = t_utype_elem(V), - AT = get_attrval(assoc_type, E), - IsAny = fun(["any","()"]) -> true; (_) -> false end, - case AT =:= "assoc" andalso IsAny(KElem) andalso IsAny(VElem) of - true -> "..."; - false -> - AS = case AT of - "assoc" -> " => "; - "exact" -> " := " - end, - KElem ++ [AS] ++ VElem - end. + AS = case get_attrval(assoc_type, E) of + "assoc" -> " => "; + "exact" -> " := " + end, + KElem ++ [AS] ++ VElem. t_record(E, Es) -> Name = ["#"] ++ t_type(get_elem(atom, Es)), |