summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Fedotov <hairyhum@gmail.com>2019-05-29 15:06:06 -0400
committerDaniil Fedotov <hairyhum@gmail.com>2019-05-29 15:06:06 -0400
commit1170d60200ff61997257373e17eae428df200594 (patch)
tree89739473dd9f58b99ca136f916d2a2e78f53ee75
parente7166314e4e661c9d87b4bcc8d2d2aa496ef27b7 (diff)
downloadrabbitmq-server-git-1170d60200ff61997257373e17eae428df200594.tar.gz
Type fixes to keep dialyzer happy
-rw-r--r--src/rabbit_msg_store.erl4
-rw-r--r--src/unconfirmed_messages.erl2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl
index e3b23cfbca..5271d503eb 100644
--- a/src/rabbit_msg_store.erl
+++ b/src/rabbit_msg_store.erl
@@ -1971,7 +1971,7 @@ cleanup_after_file_deletion(File,
%%----------------------------------------------------------------------------
-spec combine_files(non_neg_integer(), non_neg_integer(), gc_state()) ->
- {ok, deletion_thunk()} | {defer, non_neg_integer()}.
+ {ok, deletion_thunk()} | {defer, [non_neg_integer()]}.
combine_files(Source, Destination,
State = #gc_state { file_summary_ets = FileSummaryEts }) ->
@@ -2073,7 +2073,7 @@ do_combine_files(SourceSummary, DestinationSummary,
gen_server2:cast(Server, {combine_files, Source, Destination, Reclaimed}),
safe_file_delete_fun(Source, Dir, FileHandlesEts).
--spec delete_file(non_neg_integer(), gc_state()) -> {ok, deletion_thunk()} | {defer, non_neg_integer()}.
+-spec delete_file(non_neg_integer(), gc_state()) -> {ok, deletion_thunk()} | {defer, [non_neg_integer()]}.
delete_file(File, State = #gc_state { file_summary_ets = FileSummaryEts,
file_handles_ets = FileHandlesEts,
diff --git a/src/unconfirmed_messages.erl b/src/unconfirmed_messages.erl
index 63a504a239..6b4435800c 100644
--- a/src/unconfirmed_messages.erl
+++ b/src/unconfirmed_messages.erl
@@ -238,7 +238,7 @@ remove_multiple_from_reverse(Refs, MsgIds, Reverse0) ->
Reverse0,
Refs).
--spec remove_msg_ref(confirm | no_confirm, msg_id(), queue_name(), queue_ref(), ?MODULE()) ->
+-spec remove_msg_ref(confirm | no_confirm, msg_id(), queue_name() | 'ignore', queue_ref(), ?MODULE()) ->
{{confirmed | rejected, {msg_id(), exchange_name()}} | not_confirmed,
?MODULE()}.
remove_msg_ref(Confirm, MsgId, QueueName, QueueRef,