{'ok' | error(...)} -> rabbit_types:ok_or_error(...)

7 files changed, 15 insertions, 15 deletions

diff --git a/src/file_handle_cache.erl b/src/file_handle_cache.erl
index 888aed1f..99a4336d 100644
--- a/src/file_handle_cache.erl
+++ b/src/file_handle_cache.erl
@@ -182,9 +182,8 @@
 -ifdef(use_specs).
 
 -type(ref() :: any()).
--type(error() :: rabbit_types:error(any())).
--type(ok_or_error() :: ('ok' | error())).
--type(val_or_error(T) :: ({'ok', T} | error())).
+-type(ok_or_error() :: rabbit_types:ok_or_error(any())).
+-type(val_or_error(T) :: ({'ok', T} | rabbit_types:error(any()))).
 -type(position() :: ('bof' | 'eof' | non_neg_integer() |
                      {('bof' |'eof'), non_neg_integer()} | {'cur', integer()})).
 -type(offset() :: non_neg_integer()).
diff --git a/src/rabbit.erl b/src/rabbit.erl
index df466274..ec2dba46 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -191,7 +191,7 @@
 -spec(start/0 :: () -> 'ok').
 -spec(stop/0 :: () -> 'ok').
 -spec(stop_and_halt/0 :: () -> 'ok').
--spec(rotate_logs/1 :: (file_suffix()) -> 'ok' | rabbit_types:error(any())).
+-spec(rotate_logs/1 :: (file_suffix()) -> rabbit_types:ok_or_error(any())).
 -spec(status/0 :: () ->
              [{running_applications, [{atom(), string(), string()}]} |
               {nodes, [{rabbit_mnesia:node_type(), [node()]}]} |
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl
index fa7ceda6..c578c66b 100644
--- a/src/rabbit_amqqueue.erl
+++ b/src/rabbit_amqqueue.erl
@@ -114,13 +114,13 @@
 -spec(basic_consume/7 ::
       (rabbit_types:amqqueue(), boolean(), pid(), pid() | 'undefined',
        rabbit_types:ctag(), boolean(), any())
-        -> 'ok' | rabbit_types:error('exclusive_consume_unavailable')).
+        -> rabbit_types:ok_or_error('exclusive_consume_unavailable')).
 -spec(basic_cancel/4 :: (rabbit_types:amqqueue(), pid(), rabbit_types:ctag(), any()) -> 'ok').
 -spec(notify_sent/2 :: (pid(), pid()) -> 'ok').
 -spec(unblock/2 :: (pid(), pid()) -> 'ok').
 -spec(flush_all/2 :: ([pid()], pid()) -> 'ok').
 -spec(internal_declare/2 :: (rabbit_types:amqqueue(), boolean()) -> rabbit_types:amqqueue() | 'not_found').
--spec(internal_delete/1 :: (name()) -> 'ok' | rabbit_types:error('not_found')).
+-spec(internal_delete/1 :: (name()) -> rabbit_types:ok_or_error('not_found')).
 -spec(maybe_run_queue_via_backing_queue/2 :: (pid(), (fun ((A) -> A))) -> 'ok').
 -spec(update_ram_duration/1 :: (pid()) -> 'ok').
 -spec(set_ram_duration_target/2 :: (pid(), number() | 'infinity') -> 'ok').
diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl
index 8a3262d5..a0f8ed91 100644
--- a/src/rabbit_exchange.erl
+++ b/src/rabbit_exchange.erl
@@ -62,9 +62,9 @@
 -type(type() :: atom()).
 -type(binding_key() :: binary()).
 
--type(bind_res() :: 'ok' | rabbit_types:error('queue_not_found') |
-                           rabbit_types:error('exchange_not_found') |
-                           rabbit_types:error('exchange_and_queue_not_found')).
+-type(bind_res() :: rabbit_types:ok_or_error('queue_not_found' |
+                                             'exchange_not_found' |
+                                             'exchange_and_queue_not_found')).
 -type(inner_fun() :: fun((rabbit_types:exchange(), queue()) -> any())).
 
 -spec(recover/0 :: () -> 'ok').
diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl
index 8d4d0460..98921ad3 100644
--- a/src/rabbit_misc.erl
+++ b/src/rabbit_misc.erl
@@ -74,7 +74,7 @@
 
 -export_type([resource_name/0]).
 
--type(ok_or_error() :: 'ok' | rabbit_types:error(any())).
+-type(ok_or_error() :: rabbit_types:ok_or_error(any())).
 -type(resource_name() :: binary()).
 -type(thunk(T) :: fun(() -> T)).
 
@@ -151,7 +151,7 @@
 -spec(version_compare/3 :: (string(), string(),
                             ('lt' | 'lte' | 'eq' | 'gte' | 'gt')) -> boolean()).
 -spec(recursive_delete/1 :: ([file:filename()]) ->
-             'ok' | {'error', {file:filename(), any()}}).
+             rabbit_types:ok_or_error({file:filename(), any()})).
 -spec(dict_cons/3 :: (any(), any(), dict()) -> dict()).
 -spec(unlink_and_capture_exit/1 :: (pid()) -> 'ok').
 
diff --git a/src/rabbit_net.erl b/src/rabbit_net.erl
index e1c77e29..cd0ea7d6 100644
--- a/src/rabbit_net.erl
+++ b/src/rabbit_net.erl
@@ -47,10 +47,10 @@
 -type(socket() :: rabbit_networking:ip_port() | rabbit_types:ssl_socket()).
 
 -spec(async_recv/3 :: (socket(), integer(), timeout()) -> {'ok', any()}).
--spec(close/1 :: (socket()) -> 'ok' | error()).
--spec(controlling_process/2 :: (socket(), pid()) -> 'ok' | error()).
+-spec(close/1 :: (socket()) -> rabbit_types:ok_or_error(any())).
+-spec(controlling_process/2 :: (socket(), pid()) -> rabbit_types:ok_or_error(any())).
 -spec(port_command/2 :: (socket(), iolist()) -> 'true').
--spec(send/2 :: (socket(), binary() | iolist()) -> 'ok' | error()).
+-spec(send/2 :: (socket(), binary() | iolist()) -> rabbit_types:ok_or_error(any())).
 -spec(peername/1 :: (socket()) ->
         {'ok', {inet:ip_address(), rabbit_networking:ip_port()}} | error()).
 -spec(sockname/1 :: (socket()) ->
diff --git a/src/rabbit_types.erl b/src/rabbit_types.erl
index dd88135b..5adf72d7 100644
--- a/src/rabbit_types.erl
+++ b/src/rabbit_types.erl
@@ -39,7 +39,7 @@
               delivery/0, content/0, decoded_content/0, undecoded_content/0,
               unencoded_content/0, encoded_content/0, vhost/0, ctag/0, amqp_error/0,
               r/1, ssl_socket/0, listener/0, binding/0, amqqueue/0,
-              exchange/0, connection/0, user/0, error/1]).
+              exchange/0, connection/0, user/0, error/1, ok_or_error/1]).
 
 -type(maybe(T) :: T | 'none').
 -type(vhost() :: binary()).
@@ -132,5 +132,6 @@
             password :: rabbit_access_control:password()}).
 
 -type(error(A) :: {'error', A}).
+-type(ok_or_error(A) :: 'ok' | error(A)).
 
 -endif. % use_specs