diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2014-03-06 16:42:39 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2014-03-06 16:42:39 +0100 |
| commit | 544fb141916d8676bc763318074e4d0783414af1 (patch) | |
| tree | 480af3d2106cfa68565d7cf0aec90a3ea3e713de /lib/erl_docgen/src/docgen_otp_specs.erl | |
| parent | 35e8ea1c100248acc037205b0d551f6ee0b9f773 (diff) | |
| parent | 378683a454796acd1777a6efff30c11043a0e268 (diff) | |
| download | otp-544fb141916d8676bc763318074e4d0783414af1.tar.gz otp-544fb141916d8676bc763318074e4d0783414af1.tar.bz2 otp-544fb141916d8676bc763318074e4d0783414af1.zip | |
Merge branch 'egil/maps/doc-module-api'
* egil/maps/doc-module-api:
erl_docgen: Generate map() instead of #{} for maps type
stdlib: Document Maps module
stdlib: Fix maps:from_list/1 spec.
Diffstat (limited to 'lib/erl_docgen/src/docgen_otp_specs.erl')
| -rw-r--r-- | lib/erl_docgen/src/docgen_otp_specs.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/erl_docgen/src/docgen_otp_specs.erl b/lib/erl_docgen/src/docgen_otp_specs.erl index 3240edd68e..886194598f 100644 --- a/lib/erl_docgen/src/docgen_otp_specs.erl +++ b/lib/erl_docgen/src/docgen_otp_specs.erl @@ -433,7 +433,7 @@ t_tuple(Es) -> ["{"] ++ seq(fun t_utype_elem/1, Es, ["}"]). t_map() -> - ["#{}"]. + ["map()"]. t_fun(Es) -> ["("] ++ seq(fun t_utype_elem/1, get_content(argtypes, Es), |