diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-07-06 12:35:16 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-07-06 12:35:16 +0100 |
| commit | 7fdfa0192e95de1cef0b068278e92c496a9968b6 (patch) | |
| tree | 10044814cdc6f9a852ae9f20ec8476d98948278b /src | |
| parent | 12a8b8ca2839190e5f83ab86f0c2aa14c5cf59ac (diff) | |
| download | rabbitmq-server-git-7fdfa0192e95de1cef0b068278e92c496a9968b6.tar.gz | |
dialyzer doesn't support overloaded types
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_misc.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_types.erl | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl index 1940ab653e..0512591c0b 100644 --- a/src/rabbit_misc.erl +++ b/src/rabbit_misc.erl @@ -98,10 +98,10 @@ -spec(set_config/2 :: (atom(), any()) -> 'ok'). -spec(dirty_read/1 :: ({atom(), any()}) -> rabbit_types:ok(any()) | rabbit_types:error('not_found')). -spec(r/2 :: (rabbit_types:vhost(), K) - -> rabbit_types:r(rabbit_types:vhost(), K) + -> rabbit_types:r2(rabbit_types:vhost(), K) when is_subtype(K, atom())). -spec(r/3 :: (rabbit_types:vhost() | rabbit_types:r(atom()), K, resource_name()) - -> rabbit_types:r(rabbit_types:vhost(), K, resource_name()) + -> rabbit_types:r3(rabbit_types:vhost(), K, resource_name()) when is_subtype(K, atom())). -spec(r_arg/4 :: (rabbit_types:vhost() | rabbit_types:r(atom()), K, rabbit_framing:amqp_table(), binary()) diff --git a/src/rabbit_types.erl b/src/rabbit_types.erl index 212ae84037..8baef98c00 100644 --- a/src/rabbit_types.erl +++ b/src/rabbit_types.erl @@ -38,7 +38,7 @@ -export_type([txn/0, maybe/1, info/0, info_key/0, message/0, basic_message/0, delivery/0, content/0, decoded_content/0, undecoded_content/0, unencoded_content/0, encoded_content/0, vhost/0, ctag/0, amqp_error/0, - r/1, r/2, r/3, ssl_socket/0, listener/0, binding/0, amqqueue/0, + r/1, r2/2, r3/3, ssl_socket/0, listener/0, binding/0, amqqueue/0, exchange/0, connection/0, user/0, error/1, ok_or_error/1, ok/1]). -type(maybe(T) :: T | 'none'). @@ -93,9 +93,9 @@ explanation :: string(), method :: rabbit_framing:amqp_method_name()}). --type(r(Kind) :: r(vhost(), Kind, rabbit_misc:resource_name())). --type(r(VirtualHost, Kind) :: r(VirtualHost, Kind, rabbit_misc:resource_name())). --type(r(VirtualHost, Kind, Name) :: +-type(r(Kind) :: r2(vhost(), Kind)). +-type(r2(VirtualHost, Kind) :: r3(VirtualHost, Kind, rabbit_misc:resource_name())). +-type(r3(VirtualHost, Kind, Name) :: #resource{virtual_host :: VirtualHost, kind :: Kind, name :: Name}). |