diff options
author | Björn-Egil Dahlberg <[email protected]> | 2014-09-22 17:55:15 +0200 |
---|---|---|
committer | Björn-Egil Dahlberg <[email protected]> | 2014-09-22 17:55:15 +0200 |
commit | 8c8bd46bcc9d839e5de0687784d15dc819cb3ee8 (patch) | |
tree | e96eeeef77fbff40138ddf35576823921dc110fb /lib/edoc/src/edoc_types.erl | |
parent | c5afc45c9236a90dc408c9284a069a9dc233ad4e (diff) | |
parent | bca562455e1e8cb8be5a5a5de53c926eba51f977 (diff) | |
download | otp-8c8bd46bcc9d839e5de0687784d15dc819cb3ee8.tar.gz otp-8c8bd46bcc9d839e5de0687784d15dc819cb3ee8.tar.bz2 otp-8c8bd46bcc9d839e5de0687784d15dc819cb3ee8.zip |
Merge branch 'maint'
Conflicts:
lib/stdlib/src/erl_pp.erl
Diffstat (limited to 'lib/edoc/src/edoc_types.erl')
-rw-r--r-- | lib/edoc/src/edoc_types.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/edoc/src/edoc_types.erl b/lib/edoc/src/edoc_types.erl index 2f21eb24b6..65fba61a72 100644 --- a/lib/edoc/src/edoc_types.erl +++ b/lib/edoc/src/edoc_types.erl @@ -88,7 +88,7 @@ to_xml(#t_fun{args = As, range = T}, Env) -> {'fun', [{argtypes, map(fun wrap_utype/2, As, Env)}, wrap_utype(T, Env)]}; to_xml(#t_map{ types = Ts}, Env) -> - {map, map(fun wrap_utype/2, Ts, Env)}; + {map, map(fun to_xml/2, Ts, Env)}; to_xml(#t_map_field{ k_type=K, v_type=V}, Env) -> {map_field, [wrap_utype(K,Env), wrap_utype(V, Env)]}; to_xml(#t_tuple{types = Ts}, Env) -> |