replace undefined | token() with token()

3 files changed, 13 insertions, 15 deletions

diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl
index 84d8cdcb..0d44fee8 100644
--- a/src/rabbit_amqqueue.erl
+++ b/src/rabbit_amqqueue.erl
@@ -122,7 +122,7 @@
                           {'ok', non_neg_integer(), qmsg()} | 'empty').
 -spec(basic_consume/7 ::
         (rabbit_types:amqqueue(), boolean(), pid(),
-         rabbit_limiter:maybe_token(), rabbit_types:ctag(), boolean(), any())
+         rabbit_limiter:token(), rabbit_types:ctag(), boolean(), any())
         -> rabbit_types:ok_or_error('exclusive_consume_unavailable')).
 -spec(basic_cancel/4 ::
         (rabbit_types:amqqueue(), pid(), rabbit_types:ctag(), any()) -> 'ok').
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index c9dc6c8f..991f5416 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -58,7 +58,7 @@
 %% These are held in our process dictionary
 -record(cr, {consumer_count,
              ch_pid,
-             limiter,
+             limiter = rabbit_limiter:make_token(undefined),
              monitor_ref,
              acktags,
              is_limit_active,
@@ -953,7 +953,7 @@ handle_call({basic_cancel, ChPid, ConsumerTag, OkMsg}, _From,
             maybe_store_ch_record(
               case ConsumerCount of
                   1 -> ok = rabbit_limiter:unregister(Limiter, self()),
-                       C1#cr{limiter = undefined};
+                       C1#cr{limiter = rabbit_limiter:make_token(undefined)};
                   _ -> C1
               end),
             emit_consumer_deleted(ChPid, ConsumerTag),
diff --git a/src/rabbit_limiter.erl b/src/rabbit_limiter.erl
index 8ee90645..9457f7d0 100644
--- a/src/rabbit_limiter.erl
+++ b/src/rabbit_limiter.erl
@@ -30,9 +30,8 @@
 
 -ifdef(use_specs).
 
--export_type([token/0, maybe_token/0]).
+-export_type([token/0]).
 
--type(maybe_token() :: token() | 'undefined').
 -opaque(token() :: #token{}).
 
 -spec(start_link/0 :: () -> rabbit_types:ok_pid_or_error()).
@@ -40,16 +39,15 @@
 -spec(is_enabled/1 :: (token()) -> boolean()).
 -spec(enable/2 :: (token(), non_neg_integer()) -> token()).
 -spec(disable/1 :: (token()) -> token()).
--spec(limit/2 :: (maybe_token(), non_neg_integer()) ->
-                      'ok' | {'disabled', token()}).
--spec(can_send/3 :: (maybe_token(), pid(), boolean()) -> boolean()).
--spec(ack/2 :: (maybe_token(), non_neg_integer()) -> 'ok').
--spec(register/2 :: (maybe_token(), pid()) -> 'ok').
--spec(unregister/2 :: (maybe_token(), pid()) -> 'ok').
--spec(get_limit/1 :: (maybe_token()) -> non_neg_integer()).
--spec(block/1 :: (maybe_token()) -> 'ok').
--spec(unblock/1 :: (maybe_token()) -> 'ok' | {'disabled', token()}).
--spec(is_blocked/1 :: (maybe_token()) -> boolean()).
+-spec(limit/2 :: (token(), non_neg_integer()) -> 'ok' | {'disabled', token()}).
+-spec(can_send/3 :: (token(), pid(), boolean()) -> boolean()).
+-spec(ack/2 :: (token(), non_neg_integer()) -> 'ok').
+-spec(register/2 :: (token(), pid()) -> 'ok').
+-spec(unregister/2 :: (token(), pid()) -> 'ok').
+-spec(get_limit/1 :: (token()) -> non_neg_integer()).
+-spec(block/1 :: (token()) -> 'ok').
+-spec(unblock/1 :: (token()) -> 'ok' | {'disabled', token()}).
+-spec(is_blocked/1 :: (token()) -> boolean()).
 
 -endif.