diff options
| author | Henrik Nord <[email protected]> | 2011-08-29 17:15:23 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2011-08-29 17:21:47 +0200 |
| commit | 7f5f7b08a8f0ed55126192beaed9d748f14c8f0a (patch) | |
| tree | a35f7ab30a0e1a18664c1fd0e3adea281d152396 /lib/edoc/src/edoc_specs.erl | |
| parent | f94beb7788106a85a02bebcd6362a170248fa659 (diff) | |
| parent | 7d8a1f8b944d6734d9419f184c441899a48c11a3 (diff) | |
| download | otp-7f5f7b08a8f0ed55126192beaed9d748f14c8f0a.tar.gz otp-7f5f7b08a8f0ed55126192beaed9d748f14c8f0a.tar.bz2 otp-7f5f7b08a8f0ed55126192beaed9d748f14c8f0a.zip | |
Merge branch 'rz/add_proplist_type' into dev
* rz/add_proplist_type:
Add a proplist() type
OTP-9499
Diffstat (limited to 'lib/edoc/src/edoc_specs.erl')
| -rw-r--r-- | lib/edoc/src/edoc_specs.erl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/edoc/src/edoc_specs.erl b/lib/edoc/src/edoc_specs.erl index bfb17515be..5acf8ac0d5 100644 --- a/lib/edoc/src/edoc_specs.erl +++ b/lib/edoc/src/edoc_specs.erl @@ -27,7 +27,6 @@ -include("edoc.hrl"). -include("edoc_types.hrl"). --type proplist() :: [proplists:property()]. -type syntaxTree() :: erl_syntax:syntaxTree(). -define(TOP_TYPE, term). @@ -99,7 +98,7 @@ docs(Forms, CommentFun) -> -type entry() :: #entry{}. -type module_info() :: #module{}. -type entries() :: [entry()]. --spec add_data(Entries::entries(), Options::proplist(), +-spec add_data(Entries::entries(), Options::proplists:proplist(), File::file:filename(), Module::module_info()) -> entries(). %% @doc Create tags a la EDoc for Erlang specifications and types. |