diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lqueue.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_binding.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_mirror_queue_master.erl | 8 | ||||
| -rw-r--r-- | src/rabbit_msg_store.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_queue_index.erl | 12 | ||||
| -rw-r--r-- | src/rabbit_variable_queue.erl | 8 |
7 files changed, 21 insertions, 19 deletions
diff --git a/src/lqueue.erl b/src/lqueue.erl index 1e24e9e75f..fc7157dff1 100644 --- a/src/lqueue.erl +++ b/src/lqueue.erl @@ -27,7 +27,9 @@ -export_type([?MODULE/0]). --opaque ?MODULE() :: {non_neg_integer(), ?QUEUE:?QUEUE()}. +-include_lib("rabbit_common/include/old_builtin_types.hrl"). + +-opaque ?MODULE() :: {non_neg_integer(), ?QUEUE_TYPE()}. -type value() :: any(). -type result() :: 'empty' | {'value', value()}. diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 10fcfe7493..533b23f9ed 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -99,7 +99,7 @@ -spec info_keys() -> rabbit_types:info_keys(). -spec init_with_backing_queue_state (rabbit_types:amqqueue(), atom(), tuple(), any(), - [rabbit_types:delivery()], pmon:pmon(), dict:dict()) -> + [rabbit_types:delivery()], pmon:pmon(), ?DICT_TYPE()) -> #q{}. %%---------------------------------------------------------------------------- diff --git a/src/rabbit_binding.erl b/src/rabbit_binding.erl index 7cebd194a6..51bc883976 100644 --- a/src/rabbit_binding.erl +++ b/src/rabbit_binding.erl @@ -52,7 +52,7 @@ %% TODO this should really be opaque but that seems to confuse 17.1's %% dialyzer into objecting to everything that uses it. --type deletions() :: dict:dict(). +-type deletions() :: ?DICT_TYPE(). -spec recover([rabbit_exchange:name()], [rabbit_amqqueue:name()]) -> 'ok'. diff --git a/src/rabbit_mirror_queue_master.erl b/src/rabbit_mirror_queue_master.erl index 4863290303..8c1040f876 100644 --- a/src/rabbit_mirror_queue_master.erl +++ b/src/rabbit_mirror_queue_master.erl @@ -57,15 +57,15 @@ coordinator :: pid(), backing_queue :: atom(), backing_queue_state :: any(), - seen_status :: dict:dict(), + seen_status :: ?DICT_TYPE(), confirmed :: [rabbit_guid:guid()], - known_senders :: sets:set() + known_senders :: ?SET_TYPE() }. - -spec promote_backing_queue_state (rabbit_amqqueue:name(), pid(), atom(), any(), pid(), [any()], - dict:dict(), [pid()]) -> + ?DICT_TYPE(), [pid()]) -> master_state(). + -spec sender_death_fun() -> death_fun(). -spec depth_fun() -> depth_fun(). -spec init_with_existing_bq(rabbit_types:amqqueue(), atom(), any()) -> diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl index 2a6e2cd103..22af95ced1 100644 --- a/src/rabbit_msg_store.erl +++ b/src/rabbit_msg_store.erl @@ -149,7 +149,7 @@ -type client_msstate() :: #client_msstate { server :: server(), client_ref :: client_ref(), - file_handle_cache :: dict:dict(), + file_handle_cache :: ?DICT_TYPE(), index_state :: any(), index_module :: atom(), dir :: file:filename(), @@ -163,7 +163,7 @@ fun ((A) -> 'finished' | {rabbit_types:msg_id(), non_neg_integer(), A}). -type maybe_msg_id_fun() :: - 'undefined' | fun ((gb_sets:set(), 'written' | 'ignored') -> any()). + 'undefined' | fun ((?GB_SET_TYPE(), 'written' | 'ignored') -> any()). -type maybe_close_fds_fun() :: 'undefined' | fun (() -> 'ok'). -type deletion_thunk() :: fun (() -> boolean()). diff --git a/src/rabbit_queue_index.erl b/src/rabbit_queue_index.erl index 8b96bbffbd..6a14854882 100644 --- a/src/rabbit_queue_index.erl +++ b/src/rabbit_queue_index.erl @@ -197,13 +197,13 @@ -type segment() :: ('undefined' | #segment { num :: non_neg_integer(), path :: file:filename(), - journal_entries :: array:array(), - entries_to_segment :: array:array(), + journal_entries :: ?ARRAY_TYPE(), + entries_to_segment :: ?ARRAY_TYPE(), unacked :: non_neg_integer() }). -type seq_id() :: integer(). --type seg_dict() :: {dict:dict(), [segment()]}. --type on_sync_fun() :: fun ((gb_sets:set()) -> ok). +-type seg_dict() :: {?DICT_TYPE(), [segment()]}. +-type on_sync_fun() :: fun ((?GB_SET_TYPE()) -> ok). -type qistate() :: #qistate { dir :: file:filename(), segments :: 'undefined' | seg_dict(), journal_handle :: hdl(), @@ -211,8 +211,8 @@ max_journal_entries :: non_neg_integer(), on_sync :: on_sync_fun(), on_sync_msg :: on_sync_fun(), - unconfirmed :: gb_sets:set(), - unconfirmed_msg :: gb_sets:set(), + unconfirmed :: ?GB_SET_TYPE(), + unconfirmed_msg :: ?GB_SET_TYPE(), pre_publish_cache :: list(), delivered_cache :: list() }. diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index 943e3019b3..b0010e6723 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -392,10 +392,10 @@ out_counter :: non_neg_integer(), in_counter :: non_neg_integer(), rates :: rates(), - msgs_on_disk :: gb_sets:set(), - msg_indices_on_disk :: gb_sets:set(), - unconfirmed :: gb_sets:set(), - confirmed :: gb_sets:set(), + msgs_on_disk :: ?GB_SET_TYPE(), + msg_indices_on_disk :: ?GB_SET_TYPE(), + unconfirmed :: ?GB_SET_TYPE(), + confirmed :: ?GB_SET_TYPE(), ack_out_counter :: non_neg_integer(), ack_in_counter :: non_neg_integer(), disk_read_count :: non_neg_integer(), |