diff options
| -rw-r--r-- | src/delegate_sup.erl | 3 | ||||
| -rw-r--r-- | src/file_handle_cache.erl | 2 | ||||
| -rw-r--r-- | src/pg_local.erl | 5 | ||||
| -rw-r--r-- | src/rabbit_exchange_type_registry.erl | 5 | ||||
| -rw-r--r-- | src/rabbit_guid.erl | 3 | ||||
| -rw-r--r-- | src/rabbit_log.erl | 3 | ||||
| -rw-r--r-- | src/rabbit_memory_monitor.erl | 3 | ||||
| -rw-r--r-- | src/rabbit_misc.erl | 5 | ||||
| -rw-r--r-- | src/rabbit_persister.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_types.erl | 1 | ||||
| -rw-r--r-- | src/worker_pool.erl | 3 | ||||
| -rw-r--r-- | src/worker_pool_sup.erl | 8 |
12 files changed, 17 insertions, 26 deletions
diff --git a/src/delegate_sup.erl b/src/delegate_sup.erl index b5274d5d2e..39ef3f85b8 100644 --- a/src/delegate_sup.erl +++ b/src/delegate_sup.erl @@ -43,8 +43,7 @@ -ifdef(use_specs). --spec(start_link/0 :: - () -> rabbit_types:ok(pid()) | 'ignore' | rabbit_types:error(any())). +-spec(start_link/0 :: () -> rabbit_types:ok_or_error2(pid(), any()) | 'ignore'). -endif. diff --git a/src/file_handle_cache.erl b/src/file_handle_cache.erl index 1f54af572a..e209ee6be4 100644 --- a/src/file_handle_cache.erl +++ b/src/file_handle_cache.erl @@ -183,7 +183,7 @@ -type(ref() :: any()). -type(ok_or_error() :: rabbit_types:ok_or_error(any())). --type(val_or_error(T) :: (rabbit_types:ok(T) | rabbit_types:error(any()))). +-type(val_or_error(T) :: rabbit_types:ok_or_error2(T, any())). -type(position() :: ('bof' | 'eof' | non_neg_integer() | {('bof' |'eof'), non_neg_integer()} | {'cur', integer()})). diff --git a/src/pg_local.erl b/src/pg_local.erl index c9b677ccbc..f5ded123d7 100644 --- a/src/pg_local.erl +++ b/src/pg_local.erl @@ -45,9 +45,8 @@ -type(name() :: term()). --spec(start_link/0 :: - () -> rabbit_types:ok(pid()) | rabbit_types:error(term())). --spec(start/0 :: () -> rabbit_types:ok(pid()) | rabbit_types:error(term())). +-spec(start_link/0 :: () -> rabbit_types:ok_or_error2(pid(), term())). +-spec(start/0 :: () -> rabbit_types:ok_or_error2(pid(), term())). -spec(join/2 :: (name(), pid()) -> 'ok'). -spec(leave/2 :: (name(), pid()) -> 'ok'). -spec(get_members/1 :: (name()) -> [pid()]). diff --git a/src/rabbit_exchange_type_registry.erl b/src/rabbit_exchange_type_registry.erl index f666621197..7906fbee72 100644 --- a/src/rabbit_exchange_type_registry.erl +++ b/src/rabbit_exchange_type_registry.erl @@ -46,13 +46,12 @@ -ifdef(use_specs). -spec(start_link/0 :: - () -> 'ignore' | rabbit_types:error(term()) | rabbit_types:ok(pid())). + () -> 'ignore' | rabbit_types:ok_or_error2(pid(), term())). -spec(register/2 :: (binary(), atom()) -> 'ok'). -spec(binary_to_type/1 :: (binary()) -> atom() | rabbit_types:error('not_found')). -spec(lookup_module/1 :: - (atom()) -> rabbit_types:ok(atom()) | - rabbit_types:error('not_found')). + (atom()) -> rabbit_types:ok_or_error2(atom(), 'not_found')). -endif. diff --git a/src/rabbit_guid.erl b/src/rabbit_guid.erl index bce76615ac..af1c629f41 100644 --- a/src/rabbit_guid.erl +++ b/src/rabbit_guid.erl @@ -52,8 +52,7 @@ -type(guid() :: binary()). --spec(start_link/0 :: - () -> rabbit_types:ok(pid()) | 'ignore' | rabbit_types:error(any())). +-spec(start_link/0 :: () -> 'ignore' | rabbit_types:ok_or_error2(pid(), any())). -spec(guid/0 :: () -> guid()). -spec(string_guid/1 :: (any()) -> string()). -spec(binstring_guid/1 :: (any()) -> binary()). diff --git a/src/rabbit_log.erl b/src/rabbit_log.erl index 157c879ff1..85bcbca04a 100644 --- a/src/rabbit_log.erl +++ b/src/rabbit_log.erl @@ -50,8 +50,7 @@ -ifdef(use_specs). --spec(start_link/0 :: - () -> rabbit_types:ok(pid()) | 'ignore' | rabbit_types:error(any())). +-spec(start_link/0 :: () -> 'ignore' | rabbit_types:ok_or_error2(pid(), any())). -spec(debug/1 :: (string()) -> 'ok'). -spec(debug/2 :: (string(), [any()]) -> 'ok'). -spec(info/1 :: (string()) -> 'ok'). diff --git a/src/rabbit_memory_monitor.erl b/src/rabbit_memory_monitor.erl index c482ebec1d..bdf3807531 100644 --- a/src/rabbit_memory_monitor.erl +++ b/src/rabbit_memory_monitor.erl @@ -86,8 +86,7 @@ -ifdef(use_specs). --spec(start_link/0 :: - () -> 'ignore' | rabbit_types:error(any()) | rabbit_types:ok(pid())). +-spec(start_link/0 :: () -> 'ignore' | rabbit_types:ok_or_error2(pid(), any())). -spec(update/0 :: () -> 'ok'). -spec(register/2 :: (pid(), {atom(),atom(),[any()]}) -> 'ok'). -spec(deregister/1 :: (pid()) -> 'ok'). diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl index 1761dadcbc..dd85d1e44c 100644 --- a/src/rabbit_misc.erl +++ b/src/rabbit_misc.erl @@ -97,12 +97,11 @@ -> no_return()). -spec(not_found/1 :: (rabbit_types:r(atom())) -> no_return()). -spec(get_config/1 :: - (atom()) -> rabbit_types:ok(any()) | rabbit_types:error('not_found')). + (atom()) -> rabbit_types:ok_or_error2(any(), 'not_found')). -spec(get_config/2 :: (atom(), A) -> A). -spec(set_config/2 :: (atom(), any()) -> 'ok'). -spec(dirty_read/1 :: - ({atom(), any()}) - -> rabbit_types:ok(any()) | rabbit_types:error('not_found')). + ({atom(), any()}) -> rabbit_types:ok_or_error2(any(), 'not_found')). -spec(r/2 :: (rabbit_types:vhost(), K) -> rabbit_types:r3(rabbit_types:vhost(), K, '_') when is_subtype(K, atom())). diff --git a/src/rabbit_persister.erl b/src/rabbit_persister.erl index f1b255fadb..a427b13548 100644 --- a/src/rabbit_persister.erl +++ b/src/rabbit_persister.erl @@ -75,7 +75,7 @@ -spec(start_link/1 :: ([rabbit_amqqueue:name()]) - -> rabbit_types:ok(pid()) | 'ignore' | rabbit_types:error(any())). + -> 'ignore' | rabbit_types:ok_or_error2(pid(), any())). -spec(transaction/1 :: ([work_item()]) -> 'ok'). -spec(extend_transaction/2 :: ({rabbit_types:txn(), rabbit_amqqueue:name()}, [work_item()]) diff --git a/src/rabbit_types.erl b/src/rabbit_types.erl index 48eb8bb339..0b88365e66 100644 --- a/src/rabbit_types.erl +++ b/src/rabbit_types.erl @@ -140,5 +140,6 @@ -type(ok(A) :: {'ok', A}). -type(error(A) :: {'error', A}). -type(ok_or_error(A) :: 'ok' | error(A)). +-type(ok_or_error2(A, B) :: ok(A) | error(B)). -endif. % use_specs diff --git a/src/worker_pool.erl b/src/worker_pool.erl index 3105d5f90b..01ce3535d8 100644 --- a/src/worker_pool.erl +++ b/src/worker_pool.erl @@ -52,8 +52,7 @@ -ifdef(use_specs). --spec(start_link/0 :: - () -> rabbit_types:ok(pid()) | 'ignore' | rabbit_types:error(any())). +-spec(start_link/0 :: () -> 'ignore' | rabbit_types:ok_or_error2(pid(), any())). -spec(submit/1 :: (fun (() -> A) | {atom(), atom(), [any()]}) -> A). -spec(submit_async/1 :: (fun (() -> any()) | {atom(), atom(), [any()]}) -> 'ok'). diff --git a/src/worker_pool_sup.erl b/src/worker_pool_sup.erl index 220b4bad97..afa21164be 100644 --- a/src/worker_pool_sup.erl +++ b/src/worker_pool_sup.erl @@ -41,11 +41,9 @@ -ifdef(use_specs). --spec(start_link/0 :: - () -> rabbit_types:ok(pid()) | 'ignore' | rabbit_types:error(any())). --spec(start_link/1 :: - (non_neg_integer()) - -> rabbit_types:ok(pid()) | 'ignore' | rabbit_types:error(any())). +-spec(start_link/0 :: () -> 'ignore' | rabbit_types:ok_or_error2(pid(), any())). +-spec(start_link/1 :: (non_neg_integer()) -> + 'ignore' | rabbit_types:ok_or_error2(pid(), any())). -endif. |