Untuple fold function

4 files changed, 6 insertions, 6 deletions

diff --git a/src/rabbit_backing_queue.erl b/src/rabbit_backing_queue.erl
index 24dd36e1..ffa716b6 100644
--- a/src/rabbit_backing_queue.erl
+++ b/src/rabbit_backing_queue.erl
@@ -161,8 +161,8 @@
 
 %% Fold over all the messages in a queue and return the accumulated
 %% results, leaving the queue undisturbed.
--callback fold(fun(({rabbit_types:basic_message(),
-                     rabbit_types:message_properties()}, A) -> A),
+-callback fold(fun((rabbit_types:basic_message(),
+                    rabbit_types:message_properties(), A) -> A),
                A, state()) -> {A, state()}.
 
 %% How long is my queue?
diff --git a/src/rabbit_backing_queue_qc.erl b/src/rabbit_backing_queue_qc.erl
index a6d9b59a..fb8b82ea 100644
--- a/src/rabbit_backing_queue_qc.erl
+++ b/src/rabbit_backing_queue_qc.erl
@@ -332,7 +332,7 @@ postcondition(S, {call, ?BQMOD, drain_confirmed, _Args}, Res) ->
 postcondition(S, {call, ?BQMOD, fold, _Args}, {Res, _BQ}) ->
     #state{messages = Messages} = S,
     lists:foldl(fun ({_SeqId, {MsgProps, Msg}}, Acc) ->
-                        foldfun({Msg, MsgProps}, Acc)
+                        foldfun(Msg, MsgProps, Acc)
                 end, foldacc(), gb_trees:to_list(Messages)) =:= Res;
 
 postcondition(#state{bqstate = BQ, len = Len}, {call, _M, _F, _A}, _Res) ->
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index dffca79d..c4bd1836 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -2319,7 +2319,7 @@ test_variable_queue_fold(VQ0) ->
     VQ1 = rabbit_variable_queue:set_ram_duration_target(0, VQ0),
     VQ2 = variable_queue_publish(
             true, Count, fun (_, P) -> P end, fun erlang:term_to_binary/1, VQ1),
-    {Acc, VQ3} = rabbit_variable_queue:fold(fun ({M, _}, A) ->
+    {Acc, VQ3} = rabbit_variable_queue:fold(fun (M, _, A) ->
                                                     [M | A]
                                             end, [], VQ2),
     true = [term_to_binary(N) || N <- lists:seq(Count, 1, -1)] ==
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl
index 644ba182..b826413a 100644
--- a/src/rabbit_variable_queue.erl
+++ b/src/rabbit_variable_queue.erl
@@ -687,7 +687,7 @@ fold(Fun, Acc, #vqstate { q1    = Q1,
     QFun = fun(MsgStatus, {Acc0, State0}) ->
                    {#msg_status { msg = Msg, msg_props = MsgProps }, State1 } =
                        read_msg(MsgStatus, false, State0),
-                   {Fun({Msg, MsgProps}, Acc0), State1}
+                   {Fun(Msg, MsgProps, Acc0), State1}
            end,
     {Acc1, State1} = ?QUEUE:foldl(QFun, {Acc,  State},  Q4),
     {Acc2, State2} = ?QUEUE:foldl(QFun, {Acc1, State1}, Q3),
@@ -1457,7 +1457,7 @@ delta_fold(Fun, Acc, DeltaSeqId, DeltaSeqIdEnd,
                           _IsDelivered}, {Acc0, MSCState0}) ->
                             {{ok, Msg = #basic_message {}}, MSCState1} =
                               msg_store_read(MSCState0, IsPersistent, MsgId),
-                            {Fun({Msg, MsgProps}, Acc0), MSCState1}
+                            {Fun(Msg, MsgProps, Acc0), MSCState1}
                     end, {Acc, MSCState}, List),
     delta_fold(Fun, Acc1, DeltaSeqId1, DeltaSeqIdEnd,
                State #vqstate { index_state       = IndexState1,