merge default into bug20284

2 files changed, 23 insertions, 24 deletions

diff --git a/include/rabbit_backing_queue_spec.hrl b/include/rabbit_backing_queue_spec.hrl
index cc086d3c1b..98d7ee9b8d 100644
--- a/include/rabbit_backing_queue_spec.hrl
+++ b/include/rabbit_backing_queue_spec.hrl
@@ -30,8 +30,9 @@
 %%
 
 -type(fetch_result() ::
-                 %% Message,  IsDelivered,  AckTag,  Remaining_Len
-        ('empty'|{rabbit_types:basic_message(), boolean(), ack(), non_neg_integer()})).
+        ('empty' |
+         %% Message,  IsDelivered,  AckTag,  RemainingLen
+         {rabbit_types:basic_message(), boolean(), ack(), non_neg_integer()})).
 -type(is_durable() :: boolean()).
 -type(attempt_recovery() :: boolean()).
 -type(purged_msg_count() :: non_neg_integer()).
@@ -40,21 +41,23 @@
 
 -spec(start/1 :: ([rabbit_amqqueue:name()]) -> 'ok').
 -spec(stop/0 :: () -> 'ok').
--spec(init/3 :: (rabbit_amqqueue:name(), is_durable(), attempt_recovery()) -> state()).
+-spec(init/3 :: (rabbit_amqqueue:name(), is_durable(), attempt_recovery()) ->
+                     state()).
 -spec(terminate/1 :: (state()) -> state()).
 -spec(delete_and_terminate/1 :: (state()) -> state()).
 -spec(purge/1 :: (state()) -> {purged_msg_count(), state()}).
--spec(publish/3 ::
-        (rabbit_types:basic_message(), confirm_required(), state()) -> state()).
+-spec(publish/3 :: (rabbit_types:basic_message(),
+                    confirm_required(), state()) -> state()).
 -spec(publish_delivered/4 :: (ack_required(), rabbit_types:basic_message(),
-                              confirm_required(), state()) ->
-                                  {ack(), state()}).
+                              confirm_required(), state()) -> {ack(), state()}).
 -spec(fetch/2 :: (ack_required(), state()) -> {fetch_result(), state()}).
 -spec(ack/2 :: ([ack()], state()) -> {state(), [rabbit_guid:guid()]}).
--spec(tx_publish/3 :: (rabbit_types:txn(), rabbit_types:basic_message(), state()) -> state()).
+-spec(tx_publish/3 :: (rabbit_types:txn(), rabbit_types:basic_message(),
+                       state()) -> state()).
 -spec(tx_ack/3 :: (rabbit_types:txn(), [ack()], state()) -> state()).
 -spec(tx_rollback/2 :: (rabbit_types:txn(), state()) -> {[ack()], state()}).
--spec(tx_commit/3 :: (rabbit_types:txn(), fun (() -> any()), state()) -> {[ack()], state()}).
+-spec(tx_commit/3 :: (rabbit_types:txn(), fun (() -> any()), state()) ->
+                          {[ack()], state()}).
 -spec(requeue/2 :: ([ack()], state()) -> state()).
 -spec(len/1 :: (state()) -> non_neg_integer()).
 -spec(is_empty/1 :: (state()) -> boolean()).
diff --git a/src/rabbit_basic.erl b/src/rabbit_basic.erl
index 8ca98f6e9f..1ac39b6538 100644
--- a/src/rabbit_basic.erl
+++ b/src/rabbit_basic.erl
@@ -56,28 +56,24 @@
                          rabbit_types:delivery()).
 -spec(message/4 ::
         (rabbit_exchange:name(), rabbit_router:routing_key(),
-         properties_input(), binary())
-        -> (rabbit_types:message() | rabbit_types:error(any()))).
+         properties_input(), binary()) ->
+                        (rabbit_types:message() | rabbit_types:error(any()))).
 -spec(properties/1 ::
         (properties_input()) -> rabbit_framing:amqp_property_record()).
 -spec(publish/4 ::
         (rabbit_exchange:name(), rabbit_router:routing_key(),
-         properties_input(), binary())
-        -> publish_result()).
+         properties_input(), binary()) -> publish_result()).
 -spec(publish/7 ::
         (rabbit_exchange:name(), rabbit_router:routing_key(),
          boolean(), boolean(), rabbit_types:maybe(rabbit_types:txn()),
-         properties_input(), binary())
-        -> publish_result()).
--spec(build_content/2 ::
-        (rabbit_framing:amqp_property_record(), binary())
-        -> rabbit_types:content()).
--spec(from_content/1 ::
-        (rabbit_types:content())
-        -> {rabbit_framing:amqp_property_record(), binary()}).
--spec(is_message_persistent/1 ::
-        (rabbit_types:decoded_content())
-        -> (boolean() | {'invalid', non_neg_integer()})).
+         properties_input(), binary()) -> publish_result()).
+-spec(build_content/2 :: (rabbit_framing:amqp_property_record(), binary()) ->
+                              rabbit_types:content()).
+-spec(from_content/1 :: (rabbit_types:content()) ->
+                             {rabbit_framing:amqp_property_record(), binary()}).
+-spec(is_message_persistent/1 :: (rabbit_types:decoded_content()) ->
+                                      (boolean() |
+                                       {'invalid', non_neg_integer()})).
 
 -endif.