formatting and ensure use sup specs in rabbit_types

Author: Ayanda-D

deps/rabbit/src/rabbit_amqqueue.erl

@@ -2120,8 +2120,9 @@ kill_queue_hard(Node, QRes = #resource{kind = queue}, Reason) ->
     case kill_queue(Node, QRes, Reason) of
         crashed -> ok;
         stopped -> ok;
-        NewPid when is_pid(NewPid) -> timer:sleep(?KILL_QUEUE_DELAY_INTERVAL),
-                   kill_queue_hard(Node, QRes, Reason);
+        NewPid when is_pid(NewPid) ->
+            timer:sleep(?KILL_QUEUE_DELAY_INTERVAL),
+            kill_queue_hard(Node, QRes, Reason);
         Error -> Error
     end.
 

deps/rabbit_common/src/rabbit_misc.erl

@@ -1450,18 +1450,10 @@ safe_ets_update_element(Tab, Key, ElementSpec, OnSuccess, OnFailure) ->
     false
   end.
 
-%% not exported by supervisor
--type supervisor_child_id() :: term().
--type supervisor_sup_ref() :: (Name :: atom())
-                            | {Name :: atom(), Node :: node()}
-                            | {'global', Name :: atom()}
-                            | {'via', Module :: module(), Name :: any()}
-                            | pid().
-
 %% this used to be in supervisor2
 -spec find_child(Supervisor, Name) -> [pid()] when
-      Supervisor :: supervisor_sup_ref(),
-      Name :: supervisor_child_id().
+      Supervisor :: rabbit_types:sup_ref(),
+      Name :: rabbit_types:child_id().
 find_child(Supervisor, Name) ->
     [Pid || {Name1, Pid, _Type, _Modules} <- supervisor:which_children(Supervisor),
             Name1 =:= Name].

deps/rabbit_common/src/rabbit_types.erl

@@ -31,7 +31,7 @@
               authz_data/0, authz_context/0,
               permission_atom/0, rabbit_amqqueue_name/0, binding_key/0, channel_number/0,
               exchange_name/0, exchange_type/0, guid/0, routing_key/0,
-              sup_ref/0, child/0]).
+              sup_ref/0, child/0, child_id/0]).
 
 -type(option(T) :: T | 'none' | 'undefined').
 %% Deprecated, 'maybe' is a keyword in modern Erlang
@@ -218,10 +218,12 @@
 
 -type(permission_atom() :: 'configure' | 'write' | 'read').
 
+%% not exported by OTP supervisor
 -type sup_ref()   :: (Name :: atom())
                    | {Name :: atom(), Node :: node()}
                    | {'global', Name :: term()}
                    | {'via', Module :: module(), Name :: any()}
                    | pid().
 
 -type child() :: 'undefined' | pid().
+-type child_id() :: term().