diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-08-11 15:44:06 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-08-11 15:44:06 +0100 |
| commit | ff9f8b0f20b47bcd17bb379b0185011d549faaa2 (patch) | |
| tree | fef8daf5fef13b49315cfd8aed39eb887c30e486 | |
| parent | a172d18a367178c66da64437e6c5d2740859ce7b (diff) | |
| download | rabbitmq-server-ff9f8b0f20b47bcd17bb379b0185011d549faaa2.tar.gz | |
fix dialyzer types
| -rw-r--r-- | src/rabbit_amqqueue.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_limiter.erl | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index 493e6d24..2d5b696a 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -125,7 +125,7 @@ {'ok', non_neg_integer(), qmsg()} | 'empty'). -spec(basic_consume/7 :: (rabbit_types:amqqueue(), boolean(), pid(), - rabbit_limiter:token(), rabbit_types:ctag(), boolean(), any()) + rabbit_limiter:maybe_token(), rabbit_types:ctag(), boolean(), any()) -> rabbit_types:ok_or_error('exclusive_consume_unavailable')). -spec(basic_cancel/4 :: (rabbit_types:amqqueue(), pid(), rabbit_types:ctag(), any()) -> 'ok'). diff --git a/src/rabbit_limiter.erl b/src/rabbit_limiter.erl index da4af1b9..37994d2d 100644 --- a/src/rabbit_limiter.erl +++ b/src/rabbit_limiter.erl @@ -21,7 +21,6 @@ -export([init/1, terminate/2, code_change/3, handle_call/3, handle_cast/2, handle_info/2, prioritise_call/3]). -export([start_link/0, make_new_token/1, is_enabled/1, enable/2, disable/1]). --export_type([token/0]). -export([limit/2, can_send/3, ack/2, register/2, unregister/2]). -export([get_limit/1, block/1, unblock/1, is_blocked/1]). @@ -31,6 +30,8 @@ -ifdef(use_specs). +-export_type([token/0, maybe_token/0]). + -type(maybe_token() :: token() | 'undefined'). -opaque(token() :: #token{}). @@ -39,14 +40,15 @@ -spec(is_enabled/1 :: (token()) -> boolean()). -spec(enable/2 :: (token(), non_neg_integer()) -> token()). -spec(disable/1 :: (token()) -> token()). --spec(limit/2 :: (maybe_token(), non_neg_integer()) -> 'ok' | 'stopped'). +-spec(limit/2 :: (maybe_token(), non_neg_integer()) -> + 'ok' | {'disabled', token()}). -spec(can_send/3 :: (maybe_token(), pid(), boolean()) -> boolean()). -spec(ack/2 :: (maybe_token(), non_neg_integer()) -> 'ok'). -spec(register/2 :: (maybe_token(), pid()) -> 'ok'). -spec(unregister/2 :: (maybe_token(), pid()) -> 'ok'). -spec(get_limit/1 :: (maybe_token()) -> non_neg_integer()). -spec(block/1 :: (maybe_token()) -> 'ok'). --spec(unblock/1 :: (maybe_token()) -> 'ok' | 'stopped'). +-spec(unblock/1 :: (maybe_token()) -> 'ok' | {'disabled', token()}). -spec(is_blocked/1 :: (maybe_token()) -> boolean()). -endif. |