Cosmetics and formattingbug21824

4 files changed, 19 insertions, 19 deletions

diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index 27e69498..8bd6e68b 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -816,11 +816,12 @@ handle_cast({set_maximum_since_use, Age}, State) ->
 
 handle_info({'DOWN', _MonitorRef, process, DownPid, _Reason},
             State = #q{q = #amqqueue{exclusive_owner = DownPid}}) ->
-    %% Exclusively owned queues must disappear with their owner.
-    %% In the case of clean shutdown we delete the queue synchronously in the
-    %% reader - although not required by the spec this seems to match what
-    %% people expect (see bug 21824). However we need this monitor-and-async-
-    %% delete in case the connection goes away unexpectedly.
+    %% Exclusively owned queues must disappear with their owner.  In
+    %% the case of clean shutdown we delete the queue synchronously in
+    %% the reader - although not required by the spec this seems to
+    %% match what people expect (see bug 21824). However we need this
+    %% monitor-and-async- delete in case the connection goes away
+    %% unexpectedly.
     {stop, normal, State};
 handle_info({'DOWN', _MonitorRef, process, DownPid, _Reason}, State) ->
     case handle_ch_down(DownPid, State) of
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl
index 66326396..50cb5f20 100644
--- a/src/rabbit_channel.erl
+++ b/src/rabbit_channel.erl
@@ -692,8 +692,8 @@ handle_method(#'queue.declare'{queue       = QueueNameBin,
                                durable     = Durable,
                                exclusive   = ExclusiveDeclare,
                                auto_delete = AutoDelete,
-                               nowait = NoWait,
-                               arguments = Args},
+                               nowait      = NoWait,
+                               arguments   = Args},
               _, State = #ch{virtual_host        = VHostPath,
                              reader_pid          = ReaderPid,
                              queue_collector_pid = CollectorPid}) ->
diff --git a/src/rabbit_reader_queue_collector.erl b/src/rabbit_reader_queue_collector.erl
index 058affa7..841549e9 100644
--- a/src/rabbit_reader_queue_collector.erl
+++ b/src/rabbit_reader_queue_collector.erl
@@ -47,8 +47,8 @@
 -ifdef(use_specs).
 
 -spec(start_link/0 :: () -> {'ok', pid()}).
--spec(register_exclusive_queue/2 :: (pid(), pid()) -> {'ok'}).
--spec(delete_all/1 :: (pid()) -> {'ok'}).
+-spec(register_exclusive_queue/2 :: (pid(), amqqueue()) -> 'ok').
+-spec(delete_all/1 :: (pid()) -> 'ok').
 
 -endif.
 
@@ -82,12 +82,12 @@ handle_call({register_exclusive_queue, Q}, _From,
 handle_call(delete_all, _From,
             State = #state{exclusive_queues = ExclusiveQueues}) ->
     [rabbit_misc:with_exit_handler(
-        fun() -> ok end,
-        fun() ->
-                erlang:demonitor(MonitorRef),
-                rabbit_amqqueue:delete(Q, false, false)
-        end)
-        || {MonitorRef, Q} <- dict:to_list(ExclusiveQueues)],
+       fun() -> ok end,
+       fun() ->
+               erlang:demonitor(MonitorRef),
+               rabbit_amqqueue:delete(Q, false, false)
+       end)
+     || {MonitorRef, Q} <- dict:to_list(ExclusiveQueues)],
     {reply, ok, State};
 
 handle_call(shutdown, _From, State) ->
@@ -99,12 +99,10 @@ handle_cast(_Msg, State) ->
 handle_info({'DOWN', MonitorRef, process, _DownPid, _Reason},
             State = #state{exclusive_queues = ExclusiveQueues}) ->
     {noreply, State#state{exclusive_queues =
-                          dict:erase(MonitorRef, ExclusiveQueues)}}.
+                              dict:erase(MonitorRef, ExclusiveQueues)}}.
 
 terminate(_Reason, _State) ->
     ok.
 
 code_change(_OldVsn, State, _Extra) ->
     {ok, State}.
-
-%%--------------------------------------------------------------------
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index c9f07261..0217a759 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -748,7 +748,8 @@ test_user_management() ->
 test_server_status() ->
     %% create a few things so there is some useful information to list
     Writer = spawn(fun () -> receive shutdown -> ok end end),
-    Ch = rabbit_channel:start_link(1, self(), Writer, <<"user">>, <<"/">>, none),
+    Ch = rabbit_channel:start_link(1, self(), Writer, <<"user">>, <<"/">>,
+                                   self()),
     [Q, Q2] = [#amqqueue{} = rabbit_amqqueue:declare(
                                rabbit_misc:r(<<"/">>, queue, Name),
                                false, false, [], none) ||