diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-08-19 13:58:13 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-08-19 13:58:13 +0100 |
| commit | f0ee2e3a51f3635c69b0058283cb58d1ef35530a (patch) | |
| tree | 6f2614cb65b64f3dc0a16d4aed12d9e7a382d2bc | |
| parent | c06cf2cbf604aa26936d5a2f67705b3a55ee43ce (diff) | |
| download | rabbitmq-server-f0ee2e3a51f3635c69b0058283cb58d1ef35530a.tar.gz | |
Various spec-ish fixes.
| -rw-r--r-- | src/rabbit_amqqueue.erl | 10 | ||||
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_prequeue.erl | 2 |
3 files changed, 5 insertions, 9 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index e625572e..b93b6be6 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -59,8 +59,6 @@ -type(msg_id() :: non_neg_integer()). -type(ok_or_errors() :: 'ok' | {'error', [{'error' | 'exit' | 'throw', any()}]}). --type(queue_or_absent() :: rabbit_types:amqqueue() | - {'absent', rabbit_types:amqqueue()}). -type(not_found_or_absent() :: 'not_found' | {'absent', rabbit_types:amqqueue()}). -spec(recover/0 :: () -> [rabbit_types:amqqueue()]). @@ -76,9 +74,10 @@ rabbit_framing:amqp_table(), rabbit_types:maybe(pid()), node()) -> {'new' | 'existing' | 'absent' | 'owner_died', rabbit_types:amqqueue()} | rabbit_types:channel_exit()). -%% -spec(internal_declare/2 :: -%% (rabbit_types:amqqueue(), boolean()) -%% -> queue_or_absent() | rabbit_misc:thunk(queue_or_absent())). +-spec(internal_declare/1 :: + (rabbit_types:amqqueue()) + -> {'new', rabbit_misc:thunk(rabbit_types:amqqueue())} | + {'absent', rabbit_types:amqqueue()}). -spec(update/2 :: (name(), fun((rabbit_types:amqqueue()) -> rabbit_types:amqqueue())) @@ -281,7 +280,6 @@ internal_declare(Q = #amqqueue{name = QueueName}) -> case not_found_or_absent(QueueName) of not_found -> ok = store_queue(Q), B = add_default_binding(Q), - %% TODO can we simplify return here? {new, fun () -> B(), Q end}; {absent, _Q} = R -> R end. diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 1c982dbb..951542f8 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -61,8 +61,6 @@ -ifdef(use_specs). -%% -spec(start_link/1 :: -%% (rabbit_types:amqqueue()) -> rabbit_types:ok_pid_or_error()). -spec(info_keys/0 :: () -> rabbit_types:info_keys()). -spec(init_with_backing_queue_state/7 :: (rabbit_types:amqqueue(), atom(), tuple(), any(), diff --git a/src/rabbit_prequeue.erl b/src/rabbit_prequeue.erl index 148f5968..07df581b 100644 --- a/src/rabbit_prequeue.erl +++ b/src/rabbit_prequeue.erl @@ -44,7 +44,7 @@ init(Q) -> ?DESIRED_HIBERNATE}}. handle_call(Msg, _From, State) -> - {stop, {unexpected_call, Msg}, State}. + {stop, {unexpected_call, Msg}, {unexpected_call, Msg}, State}. handle_cast(init, Q) -> case whereis(rabbit_recovery) of |