cleanup

37 files changed, 315 insertions, 188 deletions

diff --git a/src/delegate.erl b/src/delegate.erl
index c2185e06..3f57953b 100644
--- a/src/delegate.erl
+++ b/src/delegate.erl
@@ -45,7 +45,8 @@
 -ifdef(use_specs).
 
 -spec(start_link/1 :: (non_neg_integer()) -> rabbit_types:ok(pid())).
--spec(invoke_no_result/2 :: (pid() | [pid()], fun ((pid()) -> any())) -> 'ok').
+-spec(invoke_no_result/2 ::
+        (pid() | [pid()], fun ((pid()) -> any())) -> 'ok').
 -spec(invoke/2 :: (pid() | [pid()], fun ((pid()) -> A)) -> A).
 
 -spec(process_count/0 :: () -> non_neg_integer()).
diff --git a/src/delegate_sup.erl b/src/delegate_sup.erl
index 9a308eb1..b5274d5d 100644
--- a/src/delegate_sup.erl
+++ b/src/delegate_sup.erl
@@ -43,7 +43,8 @@
 
 -ifdef(use_specs).
 
--spec(start_link/0 :: () -> rabbit_types:ok(pid()) | 'ignore' | rabbit_types:error(any())).
+-spec(start_link/0 ::
+        () -> rabbit_types:ok(pid()) | 'ignore' | rabbit_types:error(any())).
 
 -endif.
 
diff --git a/src/file_handle_cache.erl b/src/file_handle_cache.erl
index 790c1e08..1f54af57 100644
--- a/src/file_handle_cache.erl
+++ b/src/file_handle_cache.erl
@@ -185,14 +185,15 @@
 -type(ok_or_error() :: rabbit_types:ok_or_error(any())).
 -type(val_or_error(T) :: (rabbit_types:ok(T) | rabbit_types:error(any()))).
 -type(position() :: ('bof' | 'eof' | non_neg_integer() |
-                     {('bof' |'eof'), non_neg_integer()} | {'cur', integer()})).
+                     {('bof' |'eof'), non_neg_integer()} |
+                     {'cur', integer()})).
 -type(offset() :: non_neg_integer()).
 
 -spec(register_callback/3 :: (atom(), atom(), [any()]) -> 'ok').
 -spec(open/3 ::
-      (string(), [any()],
-       [{'write_buffer', (non_neg_integer() | 'infinity' | 'unbuffered')}]) ->
-             val_or_error(ref())).
+        (string(), [any()],
+         [{'write_buffer', (non_neg_integer() | 'infinity' | 'unbuffered')}])
+        -> val_or_error(ref())).
 -spec(close/1 :: (ref()) -> ok_or_error()).
 -spec(read/2 :: (ref(), non_neg_integer()) ->
              val_or_error([char()] | binary()) | 'eof').
diff --git a/src/gen_server2.erl b/src/gen_server2.erl
index 547f0a42..49ae63c1 100644
--- a/src/gen_server2.erl
+++ b/src/gen_server2.erl
@@ -186,7 +186,7 @@
 -ifdef(use_specs).
 
 -spec(handle_common_termination/6 ::
-      (any(), any(), any(), atom(), any(), any()) -> no_return()). 
+      (any(), any(), any(), atom(), any(), any()) -> no_return()).
 
 -spec(hibernate/7 ::
       (pid(), any(), any(), atom(), any(), queue(), any()) -> no_return()).
diff --git a/src/pg_local.erl b/src/pg_local.erl
index a316e1e0..c9b677cc 100644
--- a/src/pg_local.erl
+++ b/src/pg_local.erl
@@ -36,8 +36,8 @@
 
 -export([join/2, leave/2, get_members/1]).
 -export([sync/0]). %% intended for testing only; not part of official API
--export([start/0,start_link/0,init/1,handle_call/3,handle_cast/2,handle_info/2,
-         terminate/2]).
+-export([start/0, start_link/0, init/1, handle_call/3, handle_cast/2,
+         handle_info/2, terminate/2]).
 
 %%----------------------------------------------------------------------------
 
@@ -45,7 +45,8 @@
 
 -type(name() :: term()).
 
--spec(start_link/0 :: () -> rabbit_types:ok(pid()) | rabbit_types:error(term())).
+-spec(start_link/0 ::
+        () -> rabbit_types:ok(pid()) | rabbit_types:error(term())).
 -spec(start/0 :: () -> rabbit_types:ok(pid()) | rabbit_types:error(term())).
 -spec(join/2 :: (name(), pid()) -> 'ok').
 -spec(leave/2 :: (name(), pid()) -> 'ok').
diff --git a/src/rabbit.erl b/src/rabbit.erl
index ec2dba46..18045b94 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -33,7 +33,8 @@
 
 -behaviour(application).
 
--export([prepare/0, start/0, stop/0, stop_and_halt/0, status/0, rotate_logs/1]).
+-export([prepare/0, start/0, stop/0, stop_and_halt/0, status/0,
+         rotate_logs/1]).
 
 -export([start/2, stop/1]).
 
@@ -192,10 +193,10 @@
 -spec(stop/0 :: () -> 'ok').
 -spec(stop_and_halt/0 :: () -> 'ok').
 -spec(rotate_logs/1 :: (file_suffix()) -> rabbit_types:ok_or_error(any())).
--spec(status/0 :: () ->
-             [{running_applications, [{atom(), string(), string()}]} |
-              {nodes, [{rabbit_mnesia:node_type(), [node()]}]} |
-              {running_nodes, [node()]}]).
+-spec(status/0 ::
+        () -> [{running_applications, [{atom(), string(), string()}]} |
+               {nodes, [{rabbit_mnesia:node_type(), [node()]}]} |
+               {running_nodes, [node()]}]).
 -spec(log_location/1 :: ('sasl' | 'kernel') -> log_location()).
 
 -endif.
diff --git a/src/rabbit_access_control.erl b/src/rabbit_access_control.erl
index 4b068447..7d1839bb 100644
--- a/src/rabbit_access_control.erl
+++ b/src/rabbit_access_control.erl
@@ -54,15 +54,17 @@
 
 -spec(check_login/2 :: (binary(), binary()) -> rabbit_types:user()).
 -spec(user_pass_login/2 :: (username(), password()) -> rabbit_types:user()).
--spec(check_vhost_access/2 :: (rabbit_types:user(), rabbit_types:vhost()) -> 'ok').
+-spec(check_vhost_access/2 ::
+        (rabbit_types:user(), rabbit_types:vhost()) -> 'ok').
 -spec(check_resource_access/3 ::
-        (username(), rabbit_misc:types(atom()), permission_atom()) -> 'ok').
+        (username(), rabbit_types:r(atom()), permission_atom()) -> 'ok').
 -spec(add_user/2 :: (username(), password()) -> 'ok').
 -spec(delete_user/1 :: (username()) -> 'ok').
 -spec(change_password/2 :: (username(), password()) -> 'ok').
 -spec(list_users/0 :: () -> [username()]).
--spec(lookup_user/1 :: (username()) ->
-                            rabbit_types:ok(rabbit_types:user()) | rabbit_types:error('not_found')).
+-spec(lookup_user/1 ::
+        (username()) -> rabbit_types:ok(rabbit_types:user())
+                            | rabbit_types:error('not_found')).
 -spec(add_vhost/1 :: (rabbit_types:vhost()) -> 'ok').
 -spec(delete_vhost/1 :: (rabbit_types:vhost()) -> 'ok').
 -spec(list_vhosts/0 :: () -> [rabbit_types:vhost()]).
@@ -70,9 +72,11 @@
                            regexp(), regexp()) -> 'ok').
 -spec(clear_permissions/2 :: (username(), rabbit_types:vhost()) -> 'ok').
 -spec(list_vhost_permissions/1 ::
-        (rabbit_types:vhost()) -> [{username(), regexp(), regexp(), regexp()}]).
+        (rabbit_types:vhost())
+        -> [{username(), regexp(), regexp(), regexp()}]).
 -spec(list_user_permissions/1 ::
-        (username()) -> [{rabbit_types:vhost(), regexp(), regexp(), regexp()}]).
+        (username())
+        -> [{rabbit_types:vhost(), regexp(), regexp(), regexp()}]).
 
 -endif.
 
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl
index 169acd80..8caf1ace 100644
--- a/src/rabbit_amqqueue.erl
+++ b/src/rabbit_amqqueue.erl
@@ -71,40 +71,56 @@
       'ok' | {'error', [{'error' | 'exit' | 'throw', any()}]}).
 
 -spec(start/0 :: () -> 'ok').
--spec(declare/5 :: (name(), boolean(), boolean(), rabbit_framing:amqp_table(),
-                    rabbit_types:maybe(pid())) -> {'new' | 'existing', rabbit_types:amqqueue()}).
--spec(lookup/1 :: (name()) -> rabbit_types:ok(rabbit_types:amqqueue()) | rabbit_types:error('not_found')).
+-spec(declare/5 ::
+        (name(), boolean(), boolean(),
+         rabbit_framing:amqp_table(), rabbit_types:maybe(pid()))
+        -> {'new' | 'existing', rabbit_types:amqqueue()}).
+-spec(lookup/1 ::
+        (name()) -> rabbit_types:ok(rabbit_types:amqqueue()) |
+                    rabbit_types:error('not_found')).
 -spec(with/2 :: (name(), qfun(A)) -> A | rabbit_types:error('not_found')).
 -spec(with_or_die/2 :: (name(), qfun(A)) -> A).
--spec(assert_equivalence/5 :: (rabbit_types:amqqueue(), boolean(), boolean(),
-                               rabbit_framing:amqp_table(), rabbit_types:maybe(pid))
-                              -> ok).
+-spec(assert_equivalence/5 ::
+        (rabbit_types:amqqueue(), boolean(), boolean(),
+         rabbit_framing:amqp_table(), rabbit_types:maybe(pid))
+        -> ok).
 -spec(check_exclusive_access/2 :: (rabbit_types:amqqueue(), pid()) -> 'ok').
 -spec(with_exclusive_access_or_die/3 :: (name(), pid(), qfun(A)) -> A).
 -spec(list/1 :: (rabbit_types:vhost()) -> [rabbit_types:amqqueue()]).
 -spec(info_keys/0 :: () -> [rabbit_types:info_key()]).
 -spec(info/1 :: (rabbit_types:amqqueue()) -> [rabbit_types:info()]).
--spec(info/2 :: (rabbit_types:amqqueue(), [rabbit_types:info_key()]) -> [rabbit_types:info()]).
+-spec(info/2 ::
+        (rabbit_types:amqqueue(), [rabbit_types:info_key()])
+        -> [rabbit_types:info()]).
 -spec(info_all/1 :: (rabbit_types:vhost()) -> [[rabbit_types:info()]]).
 -spec(info_all/2 :: (rabbit_types:vhost(), [rabbit_types:info_key()])
                     -> [[rabbit_types:info()]]).
--spec(consumers/1 :: (rabbit_types:amqqueue()) -> [{pid(), rabbit_types:ctag(), boolean()}]).
--spec(consumers_all/1 :: (rabbit_types:vhost())
-                         -> [{name(), pid(), rabbit_types:ctag(), boolean()}]).
+-spec(consumers/1 ::
+        (rabbit_types:amqqueue())
+        -> [{pid(), rabbit_types:ctag(), boolean()}]).
+-spec(consumers_all/1 ::
+        (rabbit_types:vhost())
+        -> [{name(), pid(), rabbit_types:ctag(), boolean()}]).
 -spec(stat/1 ::
-        (rabbit_types:amqqueue()) -> {'ok', non_neg_integer(), non_neg_integer()}).
+        (rabbit_types:amqqueue())
+        -> {'ok', non_neg_integer(), non_neg_integer()}).
 -spec(delete/3 ::
-      (rabbit_types:amqqueue(), 'false', 'false') -> qlen();
-      (rabbit_types:amqqueue(), 'true' , 'false') -> qlen() | rabbit_types:error('in_use');
-      (rabbit_types:amqqueue(), 'false', 'true' ) -> qlen() | rabbit_types:error('not_empty');
-      (rabbit_types:amqqueue(), 'true' , 'true' ) -> qlen() |
-                                            rabbit_types:error('in_use') |
-                                            rabbit_types:error('not_empty')).
+      (rabbit_types:amqqueue(), 'false', 'false')
+        -> qlen();
+      (rabbit_types:amqqueue(), 'true' , 'false')
+        -> qlen() | rabbit_types:error('in_use');
+      (rabbit_types:amqqueue(), 'false', 'true' )
+        -> qlen() | rabbit_types:error('not_empty');
+      (rabbit_types:amqqueue(), 'true' , 'true' )
+        -> qlen() |
+           rabbit_types:error('in_use') |
+           rabbit_types:error('not_empty')).
 -spec(purge/1 :: (rabbit_types:amqqueue()) -> qlen()).
 -spec(deliver/2 :: (pid(), rabbit_types:delivery()) -> boolean()).
 -spec(requeue/3 :: (pid(), [msg_id()],  pid()) -> 'ok').
--spec(ack/4 :: (pid(), rabbit_types:maybe(rabbit_types:txn()), [msg_id()], pid())
-               -> 'ok').
+-spec(ack/4 ::
+        (pid(), rabbit_types:maybe(rabbit_types:txn()), [msg_id()], pid())
+        -> 'ok').
 -spec(commit_all/3 :: ([pid()], rabbit_types:txn(), pid()) -> ok_or_errors()).
 -spec(rollback_all/3 :: ([pid()], rabbit_types:txn(), pid()) -> 'ok').
 -spec(notify_down_all/2 :: ([pid()], pid()) -> ok_or_errors()).
@@ -115,13 +131,17 @@
       (rabbit_types:amqqueue(), boolean(), pid(), pid() | 'undefined',
        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').
+-spec(basic_cancel/4 ::
+        (rabbit_types:amqqueue(), pid(), rabbit_types:ctag(), any()) -> 'ok').
 -spec(notify_sent/2 :: (pid(), pid()) -> 'ok').
 -spec(unblock/2 :: (pid(), pid()) -> 'ok').
 -spec(flush_all/2 :: ([pid()], pid()) -> 'ok').
--spec(internal_declare/2 :: (rabbit_types:amqqueue(), boolean()) -> rabbit_types:amqqueue() | 'not_found').
+-spec(internal_declare/2 ::
+        (rabbit_types:amqqueue(), boolean())
+        -> rabbit_types:amqqueue() | 'not_found').
 -spec(internal_delete/1 :: (name()) -> rabbit_types:ok_or_error('not_found')).
--spec(maybe_run_queue_via_backing_queue/2 :: (pid(), (fun ((A) -> A))) -> 'ok').
+-spec(maybe_run_queue_via_backing_queue/2 ::
+        (pid(), (fun ((A) -> A))) -> 'ok').
 -spec(update_ram_duration/1 :: (pid()) -> 'ok').
 -spec(set_ram_duration_target/2 :: (pid(), number() | 'infinity') -> 'ok').
 -spec(set_maximum_since_use/2 :: (pid(), non_neg_integer()) -> 'ok').
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index 3bf48b4c..2fb60e96 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -35,7 +35,7 @@
 
 -behaviour(gen_server2).
 
--define(UNSENT_MESSAGE_LIMIT,        100).
+-define(UNSENT_MESSAGE_LIMIT,          100).
 -define(SYNC_INTERVAL,                 5). %% milliseconds
 -define(RAM_DURATION_UPDATE_INTERVAL,  5000).
 
diff --git a/src/rabbit_basic.erl b/src/rabbit_basic.erl
index 5d50f5c2..03a19961 100644
--- a/src/rabbit_basic.erl
+++ b/src/rabbit_basic.erl
@@ -42,28 +42,41 @@
 
 -ifdef(use_specs).
 
--type(properties_input() :: (rabbit_framing:amqp_property_record() | [{atom(), any()}])).
--type(publish_result() :: ({ok, rabbit_router:routing_result(), [pid()]}
-                           | rabbit_types:error('not_found'))).
+-type(properties_input() ::
+        (rabbit_framing:amqp_property_record() | [{atom(), any()}])).
+-type(publish_result() ::
+        ({ok, rabbit_router:routing_result(), [pid()]}
+         | rabbit_types:error('not_found'))).
 
 -spec(publish/1 :: (rabbit_types:delivery()) -> publish_result()).
--spec(delivery/4 :: (boolean(), boolean(), rabbit_types:maybe(rabbit_types:txn()),
-                     rabbit_types:message()) -> rabbit_types:delivery()).
--spec(message/4 :: (rabbit_exchange:name(), rabbit_router:routing_key(),
-                    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()).
--spec(publish/7 :: (rabbit_exchange:name(), rabbit_router:routing_key(), boolean(), boolean(),
-                    rabbit_types:maybe(rabbit_types:txn()), properties_input(), binary()) ->
-                        publish_result()).
+-spec(delivery/4 ::
+        (boolean(), boolean(), rabbit_types:maybe(rabbit_types:txn()),
+         rabbit_types:message())
+        -> rabbit_types:delivery()).
+-spec(message/4 ::
+        (rabbit_exchange:name(), rabbit_router:routing_key(),
+         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()).
+-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()}).
+        (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()})).
+        (rabbit_types:decoded_content())
+        -> (boolean() | {'invalid', non_neg_integer()})).
 
 -endif.
 
diff --git a/src/rabbit_binary_generator.erl b/src/rabbit_binary_generator.erl
index 7b43a6a7..0e6ebe57 100644
--- a/src/rabbit_binary_generator.erl
+++ b/src/rabbit_binary_generator.erl
@@ -60,15 +60,18 @@
         (rabbit_channel:channel_number(), rabbit_framing:amqp_method_record())
         -> frame()).
 -spec(build_simple_content_frames/3 ::
-        (rabbit_channel:channel_number(), rabbit_types:content(), non_neg_integer())
+        (rabbit_channel:channel_number(), rabbit_types:content(),
+         non_neg_integer())
         -> [frame()]).
 -spec(build_heartbeat_frame/0 :: () -> frame()).
 -spec(generate_table/1 :: (rabbit_framing:amqp_table()) -> binary()).
--spec(encode_properties/2 :: ([rabbit_framing:amqp_property_type()], [any()])
-                             -> binary()).
+-spec(encode_properties/2 ::
+        ([rabbit_framing:amqp_property_type()], [any()]) -> binary()).
 -spec(check_empty_content_body_frame_size/0 :: () -> 'ok').
--spec(ensure_content_encoded/1 :: (rabbit_types:content()) -> rabbit_types:encoded_content()).
--spec(clear_encoded_content/1 :: (rabbit_types:content()) -> rabbit_types:unencoded_content()).
+-spec(ensure_content_encoded/1 ::
+        (rabbit_types:content()) -> rabbit_types:encoded_content()).
+-spec(clear_encoded_content/1 ::
+        (rabbit_types:content()) -> rabbit_types:unencoded_content()).
 
 -endif.
 
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl
index b5d4e2af..fbbc50b9 100644
--- a/src/rabbit_channel.erl
+++ b/src/rabbit_channel.erl
@@ -41,8 +41,8 @@
 
 -export([flow_timeout/2]).
 
--export([init/1, terminate/2, code_change/3,
-         handle_call/3, handle_cast/2, handle_info/2, handle_pre_hibernate/1]).
+-export([init/1, terminate/2, code_change/3, handle_call/3, handle_cast/2,
+         handle_info/2, handle_pre_hibernate/1]).
 
 -record(ch, {state, channel, reader_pid, writer_pid, limiter_pid,
              transaction_id, tx_participants, next_tag,
@@ -84,7 +84,9 @@
                rabbit_types:maybe(rabbit_types:content())) -> 'ok').
 -spec(shutdown/1 :: (pid()) -> 'ok').
 -spec(send_command/2 :: (pid(), rabbit_framing:amqp_method()) -> 'ok').
--spec(deliver/4 ::(pid(), rabbit_types:ctag(), boolean(), rabbit_amqqueue:qmsg()) -> 'ok').
+-spec(deliver/4 ::
+        (pid(), rabbit_types:ctag(), boolean(), rabbit_amqqueue:qmsg())
+        -> 'ok').
 -spec(conserve_memory/2 :: (pid(), boolean()) -> 'ok').
 -spec(flushed/2 :: (pid(), pid()) -> 'ok').
 -spec(flow_timeout/2 :: (pid(), ref()) -> 'ok').
diff --git a/src/rabbit_dialyzer.erl b/src/rabbit_dialyzer.erl
index 5805611f..51a376f6 100644
--- a/src/rabbit_dialyzer.erl
+++ b/src/rabbit_dialyzer.erl
@@ -32,7 +32,8 @@
 -module(rabbit_dialyzer).
 -include("rabbit.hrl").
 
--export([create_basic_plt/1, add_to_plt/2, dialyze_files/2, halt_with_code/1]).
+-export([create_basic_plt/1, add_to_plt/2, dialyze_files/2,
+         halt_with_code/1]).
 
 %%----------------------------------------------------------------------------
 
diff --git a/src/rabbit_error_logger.erl b/src/rabbit_error_logger.erl
index e9baf2c4..42861f86 100644
--- a/src/rabbit_error_logger.erl
+++ b/src/rabbit_error_logger.erl
@@ -39,7 +39,8 @@
 
 -export([boot/0]).
 
--export([init/1, terminate/2, code_change/3, handle_call/2, handle_event/2, handle_info/2]).
+-export([init/1, terminate/2, code_change/3, handle_call/2, handle_event/2,
+         handle_info/2]).
 
 boot() ->
     {ok, DefaultVHost} = application:get_env(default_vhost),
diff --git a/src/rabbit_error_logger_file_h.erl b/src/rabbit_error_logger_file_h.erl
index 45b66712..875d680f 100644
--- a/src/rabbit_error_logger_file_h.erl
+++ b/src/rabbit_error_logger_file_h.erl
@@ -33,7 +33,8 @@
 
 -behaviour(gen_event).
 
--export([init/1, handle_event/2, handle_call/2, handle_info/2, terminate/2, code_change/3]).
+-export([init/1, handle_event/2, handle_call/2, handle_info/2, terminate/2,
+         code_change/3]).
 
 %% rabbit_error_logger_file_h is a wrapper around the error_logger_file_h
 %% module because the original's init/1 does not match properly
diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl
index 024dccf0..9dca456d 100644
--- a/src/rabbit_exchange.erl
+++ b/src/rabbit_exchange.erl
@@ -33,9 +33,8 @@
 -include("rabbit.hrl").
 -include("rabbit_framing.hrl").
 
--export([recover/0, declare/5, lookup/1, lookup_or_die/1,
-         list/1, info_keys/0, info/1, info/2, info_all/1, info_all/2,
-         publish/2]).
+-export([recover/0, declare/5, lookup/1, lookup_or_die/1, list/1, info_keys/0,
+         info/1, info/2, info_all/1, info_all/2, publish/2]).
 -export([add_binding/5, delete_binding/5, list_bindings/1]).
 -export([delete/2]).
 -export([delete_queue_bindings/1, delete_transient_queue_bindings/1]).
@@ -68,44 +67,55 @@
 -type(inner_fun() :: fun((rabbit_types:exchange(), queue()) -> any())).
 
 -spec(recover/0 :: () -> 'ok').
--spec(declare/5 :: (name(), type(), boolean(), boolean(),
-                    rabbit_framing:amqp_table()) -> rabbit_types:exchange()).
+-spec(declare/5 ::
+        (name(), type(), boolean(), boolean(), rabbit_framing:amqp_table())
+        -> rabbit_types:exchange()).
 -spec(check_type/1 :: (binary()) -> atom()).
--spec(assert_equivalence/5 :: (rabbit_types:exchange(), atom(), boolean(), boolean(),
-                               rabbit_framing:amqp_table()) -> 'ok').
+-spec(assert_equivalence/5 ::
+        (rabbit_types:exchange(), atom(), boolean(), boolean(),
+         rabbit_framing:amqp_table())
+        -> 'ok').
 -spec(assert_args_equivalence/2 ::
         (rabbit_types:exchange(), rabbit_framing:amqp_table()) -> 'ok').
--spec(lookup/1 :: (name())
-                  -> rabbit_types:ok(rabbit_types:exchange()) | rabbit_types:error('not_found')).
+-spec(lookup/1 ::
+        (name()) -> rabbit_types:ok(rabbit_types:exchange()) |
+                    rabbit_types:error('not_found')).
 -spec(lookup_or_die/1 :: (name()) -> rabbit_types:exchange()).
 -spec(list/1 :: (rabbit_types:vhost()) -> [rabbit_types:exchange()]).
 -spec(info_keys/0 :: () -> [rabbit_types:info_key()]).
 -spec(info/1 :: (rabbit_types:exchange()) -> [rabbit_types:info()]).
--spec(info/2 :: (rabbit_types:exchange(), [rabbit_types:info_key()]) -> [rabbit_types:info()]).
+-spec(info/2 ::
+        (rabbit_types:exchange(), [rabbit_types:info_key()])
+        -> [rabbit_types:info()]).
 -spec(info_all/1 :: (rabbit_types:vhost()) -> [[rabbit_types:info()]]).
--spec(info_all/2 :: (rabbit_types:vhost(), [rabbit_types:info_key()])
+-spec(info_all/2 ::(rabbit_types:vhost(), [rabbit_types:info_key()])
                     -> [[rabbit_types:info()]]).
 -spec(publish/2 :: (rabbit_types:exchange(), rabbit_types:delivery())
                    -> {rabbit_router:routing_result(), [pid()]}).
 -spec(add_binding/5 ::
         (name(), rabbit_amqqueue:name(), rabbit_router:routing_key(),
-         rabbit_framing:amqp_table(), inner_fun()) -> bind_res()).
+         rabbit_framing:amqp_table(), inner_fun())
+        -> bind_res()).
 -spec(delete_binding/5 ::
         (name(), rabbit_amqqueue:name(), rabbit_router:routing_key(),
          rabbit_framing:amqp_table(), inner_fun())
         -> bind_res() | rabbit_types:error('binding_not_found')).
--spec(list_bindings/1 :: (rabbit_types:vhost()) ->
-             [{name(), rabbit_amqqueue:name(),
-               rabbit_router:routing_key(), rabbit_framing:amqp_table()}]).
+-spec(list_bindings/1 ::
+        (rabbit_types:vhost())
+        -> [{name(), rabbit_amqqueue:name(), rabbit_router:routing_key(),
+             rabbit_framing:amqp_table()}]).
 -spec(delete_queue_bindings/1 ::
         (rabbit_amqqueue:name()) -> fun (() -> none())).
--spec(delete_transient_queue_bindings/1 :: (rabbit_amqqueue:name()) ->
-             fun (() -> none())).
--spec(delete/2 :: (name(), boolean()) ->
-             'ok' | rabbit_types:error('not_found') | rabbit_types:error('in_use')).
+-spec(delete_transient_queue_bindings/1 ::
+        (rabbit_amqqueue:name()) -> fun (() -> none())).
+-spec(delete/2 ::
+        (name(), boolean())-> 'ok' |
+                              rabbit_types:error('not_found') |
+                              rabbit_types:error('in_use')).
 -spec(list_queue_bindings/1 ::
         (rabbit_amqqueue:name())
-        -> [{name(), rabbit_router:routing_key(), rabbit_framing:amqp_table()}]).
+        -> [{name(), rabbit_router:routing_key(),
+             rabbit_framing:amqp_table()}]).
 -spec(list_exchange_bindings/1 ::
         (name()) -> [{rabbit_amqqueue:name(), rabbit_router:routing_key(),
                       rabbit_framing:amqp_table()}]).
diff --git a/src/rabbit_exchange_type_fanout.erl b/src/rabbit_exchange_type_fanout.erl
index 4f9712b1..94798c78 100644
--- a/src/rabbit_exchange_type_fanout.erl
+++ b/src/rabbit_exchange_type_fanout.erl
@@ -35,8 +35,8 @@
 -behaviour(rabbit_exchange_type).
 
 -export([description/0, publish/2]).
--export([validate/1, create/1, recover/2, delete/2,
-         add_binding/2, remove_bindings/2, assert_args_equivalence/2]).
+-export([validate/1, create/1, recover/2, delete/2, add_binding/2,
+         remove_bindings/2, assert_args_equivalence/2]).
 -include("rabbit_exchange_type_spec.hrl").
 
 -rabbit_boot_step({?MODULE,
diff --git a/src/rabbit_exchange_type_headers.erl b/src/rabbit_exchange_type_headers.erl
index c748c364..44607398 100644
--- a/src/rabbit_exchange_type_headers.erl
+++ b/src/rabbit_exchange_type_headers.erl
@@ -36,8 +36,8 @@
 -behaviour(rabbit_exchange_type).
 
 -export([description/0, publish/2]).
--export([validate/1, create/1, recover/2, delete/2,
-         add_binding/2, remove_bindings/2, assert_args_equivalence/2]).
+-export([validate/1, create/1, recover/2, delete/2, add_binding/2,
+         remove_bindings/2, assert_args_equivalence/2]).
 -include("rabbit_exchange_type_spec.hrl").
 
 -rabbit_boot_step({?MODULE,
diff --git a/src/rabbit_exchange_type_registry.erl b/src/rabbit_exchange_type_registry.erl
index 729ede3e..f6666211 100644
--- a/src/rabbit_exchange_type_registry.erl
+++ b/src/rabbit_exchange_type_registry.erl
@@ -35,8 +35,8 @@
 
 -export([start_link/0]).
 
--export([init/1, handle_call/3, handle_cast/2, handle_info/2,
-         terminate/2, code_change/3]).
+-export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2,
+         code_change/3]).
 
 -export([register/2, binary_to_type/1, lookup_module/1]).
 
@@ -45,10 +45,14 @@
 
 -ifdef(use_specs).
 
--spec(start_link/0 :: () -> 'ignore' | rabbit_types:error(term()) | rabbit_types:ok(pid())).
+-spec(start_link/0 ::
+        () -> 'ignore' | rabbit_types:error(term()) | rabbit_types:ok(pid())).
 -spec(register/2 :: (binary(), atom()) -> 'ok').
--spec(binary_to_type/1 :: (binary()) -> atom() | rabbit_types:error('not_found')).
--spec(lookup_module/1 :: (atom()) -> rabbit_types:ok(atom()) | rabbit_types:error('not_found')).
+-spec(binary_to_type/1 ::
+        (binary()) -> atom() | rabbit_types:error('not_found')).
+-spec(lookup_module/1 ::
+        (atom()) -> rabbit_types:ok(atom()) |
+                    rabbit_types:error('not_found')).
 
 -endif.
 
diff --git a/src/rabbit_exchange_type_topic.erl b/src/rabbit_exchange_type_topic.erl
index 0e22d545..a374cfee 100644
--- a/src/rabbit_exchange_type_topic.erl
+++ b/src/rabbit_exchange_type_topic.erl
@@ -35,8 +35,8 @@
 -behaviour(rabbit_exchange_type).
 
 -export([description/0, publish/2]).
--export([validate/1, create/1, recover/2, delete/2,
-         add_binding/2, remove_bindings/2, assert_args_equivalence/2]).
+-export([validate/1, create/1, recover/2, delete/2, add_binding/2,
+         remove_bindings/2, assert_args_equivalence/2]).
 -include("rabbit_exchange_type_spec.hrl").
 
 -rabbit_boot_step({?MODULE,
@@ -49,7 +49,9 @@
 -export([topic_matches/2]).
 
 -ifdef(use_specs).
+
 -spec(topic_matches/2 :: (binary(), binary()) -> boolean()).
+
 -endif.
 
 description() ->
diff --git a/src/rabbit_guid.erl b/src/rabbit_guid.erl
index 45cbcc80..0cbd47d8 100644
--- a/src/rabbit_guid.erl
+++ b/src/rabbit_guid.erl
@@ -38,8 +38,8 @@
 -export([start_link/0]).
 -export([guid/0, string_guid/1, binstring_guid/1]).
 
--export([init/1, handle_call/3, handle_cast/2, handle_info/2,
-         terminate/2, code_change/3]).
+-export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2,
+         code_change/3]).
 
 -define(SERVER, ?MODULE).
 -define(SERIAL_FILENAME, "rabbit_serial").
@@ -54,7 +54,8 @@
 
 -type(guid() :: binary()).
 
--spec(start_link/0 :: () -> rabbit_types:ok(pid()) | 'ignore' | rabbit_types:error(any())).
+-spec(start_link/0 ::
+        () -> rabbit_types:ok(pid()) | 'ignore' | rabbit_types:error(any())).
 -spec(guid/0 :: () -> guid()).
 -spec(string_guid/1 :: (any()) -> string()).
 -spec(binstring_guid/1 :: (any()) -> binary()).
diff --git a/src/rabbit_log.erl b/src/rabbit_log.erl
index 7beed2c0..157c879f 100644
--- a/src/rabbit_log.erl
+++ b/src/rabbit_log.erl
@@ -50,7 +50,8 @@
 
 -ifdef(use_specs).
 
--spec(start_link/0 :: () -> rabbit_types:ok(pid()) | 'ignore' | rabbit_types:error(any())).
+-spec(start_link/0 ::
+        () -> rabbit_types:ok(pid()) | 'ignore' | rabbit_types:error(any())).
 -spec(debug/1 :: (string()) -> 'ok').
 -spec(debug/2 :: (string(), [any()]) -> 'ok').
 -spec(info/1 :: (string()) -> 'ok').
diff --git a/src/rabbit_memory_monitor.erl b/src/rabbit_memory_monitor.erl
index 4c5695e9..c482ebec 100644
--- a/src/rabbit_memory_monitor.erl
+++ b/src/rabbit_memory_monitor.erl
@@ -86,12 +86,13 @@
 
 -ifdef(use_specs).
 
--spec(start_link/0 :: () -> 'ignore' | rabbit_types:error(any()) | rabbit_types:ok(pid())).
+-spec(start_link/0 ::
+        () -> 'ignore' | rabbit_types:error(any()) | rabbit_types:ok(pid())).
 -spec(update/0 :: () -> 'ok').
 -spec(register/2 :: (pid(), {atom(),atom(),[any()]}) -> 'ok').
 -spec(deregister/1 :: (pid()) -> 'ok').
--spec(report_ram_duration/2 :: (pid(), float() | 'infinity') ->
-                                    number() | 'infinity').
+-spec(report_ram_duration/2 ::
+        (pid(), float() | 'infinity') -> number() | 'infinity').
 -spec(stop/0 :: () -> 'ok').
 
 -endif.
diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl
index 0512591c..a46c7628 100644
--- a/src/rabbit_misc.erl
+++ b/src/rabbit_misc.erl
@@ -87,53 +87,67 @@
                        -> no_return()).
 -spec(amqp_error/4 ::
         (rabbit_framing:amqp_exception(), string(), [any()],
-         rabbit_framing:amqp_method_name()) -> rabbit_types:amqp_error()).
+         rabbit_framing:amqp_method_name())
+        -> rabbit_types:amqp_error()).
 -spec(protocol_error/3 :: (rabbit_framing:amqp_exception(), string(), [any()])
                           -> no_return()).
--spec(protocol_error/4 :: (rabbit_framing:amqp_exception(), string(), [any()],
-                           rabbit_framing:amqp_method_name()) -> no_return()).
+-spec(protocol_error/4 ::
+        (rabbit_framing:amqp_exception(), string(), [any()],
+         rabbit_framing:amqp_method_name())
+        -> no_return()).
 -spec(not_found/1 :: (rabbit_types:r(atom())) -> no_return()).
--spec(get_config/1 :: (atom()) -> rabbit_types:ok(any()) | rabbit_types:error('not_found')).
+-spec(get_config/1 ::
+        (atom()) -> rabbit_types:ok(any()) | rabbit_types:error('not_found')).
 -spec(get_config/2 :: (atom(), A) -> A).
 -spec(set_config/2 :: (atom(), any()) -> 'ok').
--spec(dirty_read/1 :: ({atom(), any()}) -> rabbit_types:ok(any()) | rabbit_types:error('not_found')).
+-spec(dirty_read/1 ::
+        ({atom(), any()})
+        -> rabbit_types:ok(any()) | rabbit_types:error('not_found')).
 -spec(r/2 :: (rabbit_types:vhost(), K)
-             -> rabbit_types:r2(rabbit_types:vhost(), K)
-                    when is_subtype(K, atom())).
--spec(r/3 :: (rabbit_types:vhost() | rabbit_types:r(atom()), K, resource_name())
-             -> rabbit_types:r3(rabbit_types:vhost(), K, resource_name())
+             -> rabbit_types:r2(rabbit_types:vhost(), K, '_')
                     when is_subtype(K, atom())).
--spec(r_arg/4 :: (rabbit_types:vhost() | rabbit_types:r(atom()), K,
-                  rabbit_framing:amqp_table(), binary())
-                 -> undefined | rabbit_types:r(K)  when is_subtype(K, atom())).
+-spec(r/3 ::
+        (rabbit_types:vhost() | rabbit_types:r(atom()), K, resource_name())
+        -> rabbit_types:r3(rabbit_types:vhost(), K, resource_name())
+               when is_subtype(K, atom())).
+-spec(r_arg/4 ::
+        (rabbit_types:vhost() | rabbit_types:r(atom()), K,
+         rabbit_framing:amqp_table(), binary())
+        -> undefined | rabbit_types:r(K)
+               when is_subtype(K, atom())).
 -spec(rs/1 :: (rabbit_types:r(atom())) -> string()).
 -spec(enable_cover/0 :: () -> ok_or_error()).
 -spec(start_cover/1 :: ([{string(), string()} | string()]) -> 'ok').
 -spec(report_cover/0 :: () -> 'ok').
 -spec(enable_cover/1 :: (file:filename()) -> ok_or_error()).
 -spec(report_cover/1 :: (file:filename()) -> 'ok').
--spec(throw_on_error/2 :: (atom(), thunk(rabbit_types:error(any()) | {ok, A} | A)) -> A).
+-spec(throw_on_error/2 ::
+        (atom(), thunk(rabbit_types:error(any()) | {ok, A} | A)) -> A).
 -spec(with_exit_handler/2 :: (thunk(A), thunk(A)) -> A).
 -spec(filter_exit_map/2 :: (fun ((A) -> B), [A]) -> [B]).
 -spec(with_user/2 :: (rabbit_access_control:username(), thunk(A)) -> A).
 -spec(with_vhost/2 :: (rabbit_types:vhost(), thunk(A)) -> A).
--spec(with_user_and_vhost/3 :: (rabbit_access_control:username(),
-                                rabbit_types:vhost(), thunk(A)) -> A).
+-spec(with_user_and_vhost/3 ::
+        (rabbit_access_control:username(), rabbit_types:vhost(), thunk(A))
+        -> A).
 -spec(execute_mnesia_transaction/1 :: (thunk(A)) -> A).
 -spec(ensure_ok/2 :: (ok_or_error(), atom()) -> 'ok').
 -spec(makenode/1 :: ({string(), string()} | string()) -> node()).
 -spec(nodeparts/1 :: (node() | string()) -> {string(), string()}).
 -spec(cookie_hash/0 :: () -> string()).
--spec(tcp_name/3 :: (atom(), inet:ip_address(), rabbit_networking:ip_port()) -> atom()).
+-spec(tcp_name/3 ::
+        (atom(), inet:ip_address(), rabbit_networking:ip_port())
+        -> atom()).
 -spec(intersperse/2 :: (A, [A]) -> [A]).
 -spec(upmap/2 :: (fun ((A) -> B), [A]) -> [B]).
 -spec(map_in_order/2 :: (fun ((A) -> B), [A]) -> [B]).
 -spec(table_fold/3 :: (fun ((any(), A) -> A), A, atom()) -> A).
 -spec(dirty_read_all/1 :: (atom()) -> [any()]).
--spec(dirty_foreach_key/2 :: (fun ((any()) -> any()), atom()) ->
-             'ok' | 'aborted').
+-spec(dirty_foreach_key/2 :: (fun ((any()) -> any()), atom())
+                             -> 'ok' | 'aborted').
 -spec(dirty_dump_log/1 :: (file:filename()) -> ok_or_error()).
--spec(read_term_file/1 :: (file:filename()) -> {'ok', [any()]} | rabbit_types:error(any())).
+-spec(read_term_file/1 ::
+        (file:filename()) -> {'ok', [any()]} | rabbit_types:error(any())).
 -spec(write_term_file/2 :: (file:filename(), [any()]) -> ok_or_error()).
 -spec(append_file/2 :: (file:filename(), string()) -> ok_or_error()).
 -spec(ensure_parent_dirs_exist/1 :: (string()) -> 'ok').
@@ -143,14 +157,17 @@
 -spec(unfold/2  :: (fun ((A) -> ({'true', B, A} | 'false')), A) -> {[B], A}).
 -spec(ceil/1 :: (number()) -> integer()).
 -spec(queue_fold/3 :: (fun ((any(), B) -> B), B, queue()) -> B).
--spec(sort_field_table/1 :: (rabbit_framing:amqp_table()) -> rabbit_framing:amqp_table()).
+-spec(sort_field_table/1 ::
+        (rabbit_framing:amqp_table()) -> rabbit_framing:amqp_table()).
 -spec(pid_to_string/1 :: (pid()) -> string()).
 -spec(string_to_pid/1 :: (string()) -> pid()).
 -spec(version_compare/2 :: (string(), string()) -> 'lt' | 'eq' | 'gt').
--spec(version_compare/3 :: (string(), string(),
-                            ('lt' | 'lte' | 'eq' | 'gte' | 'gt')) -> boolean()).
--spec(recursive_delete/1 :: ([file:filename()]) ->
-             rabbit_types:ok_or_error({file:filename(), any()})).
+-spec(version_compare/3 ::
+        (string(), string(), ('lt' | 'lte' | 'eq' | 'gte' | 'gt'))
+        -> boolean()).
+-spec(recursive_delete/1 ::
+        ([file:filename()])
+        -> rabbit_types:ok_or_error({file:filename(), any()})).
 -spec(dict_cons/3 :: (any(), any(), dict()) -> dict()).
 -spec(unlink_and_capture_exit/1 :: (pid()) -> 'ok').
 
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl
index 20b08eb3..5c14ba7b 100644
--- a/src/rabbit_mnesia.erl
+++ b/src/rabbit_mnesia.erl
@@ -29,6 +29,7 @@
 %%   Contributor(s): ______________________________________.
 %%
 
+
 -module(rabbit_mnesia).
 
 -export([ensure_mnesia_dir/0, dir/0, status/0, init/0, is_db_empty/0,
diff --git a/src/rabbit_net.erl b/src/rabbit_net.erl
index 20485bec..6baa4b88 100644
--- a/src/rabbit_net.erl
+++ b/src/rabbit_net.erl
@@ -40,23 +40,33 @@
 
 -ifdef(use_specs).
 
+-export_type([socket/0]).
+
 -type(stat_option() ::
 	'recv_cnt' | 'recv_max' | 'recv_avg' | 'recv_oct' | 'recv_dvi' |
 	'send_cnt' | 'send_max' | 'send_avg' | 'send_oct' | 'send_pend').
 -type(error() :: rabbit_types:error(any())).
 -type(socket() :: rabbit_networking:ip_port() | rabbit_types:ssl_socket()).
 
--spec(async_recv/3 :: (socket(), integer(), timeout()) -> rabbit_types:ok(any())).
+-spec(async_recv/3 ::
+        (socket(), integer(), timeout()) -> rabbit_types:ok(any())).
 -spec(close/1 :: (socket()) -> rabbit_types:ok_or_error(any())).
--spec(controlling_process/2 :: (socket(), pid()) -> rabbit_types:ok_or_error(any())).
+-spec(controlling_process/2 ::
+        (socket(), pid()) -> rabbit_types:ok_or_error(any())).
 -spec(port_command/2 :: (socket(), iolist()) -> 'true').
--spec(send/2 :: (socket(), binary() | iolist()) -> rabbit_types:ok_or_error(any())).
--spec(peername/1 :: (socket()) ->
-        rabbit_types:ok({inet:ip_address(), rabbit_networking:ip_port()}) | error()).
--spec(sockname/1 :: (socket()) ->
-        rabbit_types:ok({inet:ip_address(), rabbit_networking:ip_port()}) | error()).
--spec(getstat/2 :: (socket(), [stat_option()]) ->
-        rabbit_types:ok([{stat_option(), integer()}]) | error()).
+-spec(send/2 ::
+        (socket(), binary() | iolist()) -> rabbit_types:ok_or_error(any())).
+-spec(peername/1 ::
+        (socket())
+        -> rabbit_types:ok({inet:ip_address(), rabbit_networking:ip_port()}) |
+           error()).
+-spec(sockname/1 ::
+        (socket())
+        -> rabbit_types:ok({inet:ip_address(), rabbit_networking:ip_port()}) |
+           error()).
+-spec(getstat/2 ::
+        (socket(), [stat_option()])
+        -> rabbit_types:ok([{stat_option(), integer()}]) | error()).
 
 -endif.
 
diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl
index 938da9b5..3a3357ba 100644
--- a/src/rabbit_networking.erl
+++ b/src/rabbit_networking.erl
@@ -74,14 +74,18 @@
 -spec(node_listeners/1 :: (node()) -> [rabbit_types:listener()]).
 -spec(connections/0 :: () -> [rabbit_types:connection()]).
 -spec(connection_info_keys/0 :: () -> [rabbit_types:info_key()]).
--spec(connection_info/1 :: (rabbit_types:connection()) -> [rabbit_types:info()]).
--spec(connection_info/2 :: (rabbit_types:connection(), [rabbit_types:info_key()]) -> [rabbit_types:info()]).
+-spec(connection_info/1 ::
+        (rabbit_types:connection()) -> [rabbit_types:info()]).
+-spec(connection_info/2 ::
+        (rabbit_types:connection(), [rabbit_types:info_key()])
+        -> [rabbit_types:info()]).
 -spec(connection_info_all/0 :: () -> [[rabbit_types:info()]]).
--spec(connection_info_all/1 :: ([rabbit_types:info_key()]) -> [[rabbit_types:info()]]).
+-spec(connection_info_all/1 ::
+        ([rabbit_types:info_key()]) -> [[rabbit_types:info()]]).
 -spec(close_connection/2 :: (pid(), string()) -> 'ok').
 -spec(on_node_down/1 :: (node()) -> 'ok').
--spec(check_tcp_listener_address/3 :: (atom(), hostname(), ip_port()) ->
-             {inet:ip_address(), atom()}).
+-spec(check_tcp_listener_address/3 ::
+        (atom(), hostname(), ip_port()) -> {inet:ip_address(), atom()}).
 
 -endif.
 
diff --git a/src/rabbit_persister.erl b/src/rabbit_persister.erl
index 327fc4b7..f1b255fa 100644
--- a/src/rabbit_persister.erl
+++ b/src/rabbit_persister.erl
@@ -73,15 +73,21 @@
       {deliver, pmsg()} |
       {ack, pmsg()}).
 
--spec(start_link/1 :: ([rabbit_amqqueue:name()]) ->
-                           rabbit_types:ok(pid()) | 'ignore' | rabbit_types:error(any())).
+-spec(start_link/1 ::
+        ([rabbit_amqqueue:name()])
+        -> rabbit_types:ok(pid()) | 'ignore' | rabbit_types:error(any())).
 -spec(transaction/1 :: ([work_item()]) -> 'ok').
--spec(extend_transaction/2 :: ({rabbit_types:txn(), rabbit_amqqueue:name()}, [work_item()]) -> 'ok').
+-spec(extend_transaction/2 ::
+        ({rabbit_types:txn(), rabbit_amqqueue:name()}, [work_item()])
+        -> 'ok').
 -spec(dirty_work/1 :: ([work_item()]) -> 'ok').
--spec(commit_transaction/1 :: ({rabbit_types:txn(), rabbit_amqqueue:name()}) -> 'ok').
--spec(rollback_transaction/1 :: ({rabbit_types:txn(), rabbit_amqqueue:name()}) -> 'ok').
+-spec(commit_transaction/1 ::
+        ({rabbit_types:txn(), rabbit_amqqueue:name()}) -> 'ok').
+-spec(rollback_transaction/1 ::
+        ({rabbit_types:txn(), rabbit_amqqueue:name()}) -> 'ok').
 -spec(force_snapshot/0 :: () -> 'ok').
--spec(queue_content/1 :: (rabbit_amqqueue:name()) -> [{rabbit_types:message(), boolean()}]).
+-spec(queue_content/1 ::
+        (rabbit_amqqueue:name()) -> [{rabbit_types:message(), boolean()}]).
 
 -endif.
 
diff --git a/src/rabbit_router.erl b/src/rabbit_router.erl
index bc9b3891..d50b9f31 100644
--- a/src/rabbit_router.erl
+++ b/src/rabbit_router.erl
@@ -46,7 +46,8 @@
 -type(routing_key() :: binary()).
 -type(routing_result() :: 'routed' | 'unroutable' | 'not_delivered').
 
--spec(deliver/2 :: ([pid()], rabbit_types:delivery()) -> {routing_result(), [pid()]}).
+-spec(deliver/2 ::
+        ([pid()], rabbit_types:delivery()) -> {routing_result(), [pid()]}).
 
 -endif.
 
diff --git a/src/rabbit_sasl_report_file_h.erl b/src/rabbit_sasl_report_file_h.erl
index 434cdae0..eb2037c2 100644
--- a/src/rabbit_sasl_report_file_h.erl
+++ b/src/rabbit_sasl_report_file_h.erl
@@ -33,7 +33,8 @@
 
 -behaviour(gen_event).
 
--export([init/1, handle_event/2, handle_call/2, handle_info/2, terminate/2, code_change/3]).
+-export([init/1, handle_event/2, handle_call/2, handle_info/2, terminate/2,
+         code_change/3]).
 
 %% rabbit_sasl_report_file_h is a wrapper around the sasl_report_file_h
 %% module because the original's init/1 does not match properly
diff --git a/src/rabbit_types.erl b/src/rabbit_types.erl
index 8baef98c..48eb8bb3 100644
--- a/src/rabbit_types.erl
+++ b/src/rabbit_types.erl
@@ -37,9 +37,10 @@
 
 -export_type([txn/0, maybe/1, info/0, info_key/0, message/0, basic_message/0,
               delivery/0, content/0, decoded_content/0, undecoded_content/0,
-              unencoded_content/0, encoded_content/0, vhost/0, ctag/0, amqp_error/0,
-              r/1, r2/2, r3/3, ssl_socket/0, listener/0, binding/0, amqqueue/0,
-              exchange/0, connection/0, user/0, error/1, ok_or_error/1, ok/1]).
+              unencoded_content/0, encoded_content/0, vhost/0, ctag/0,
+              amqp_error/0, r/1, r2/2, r3/3, ssl_socket/0, listener/0,
+              binding/0, amqqueue/0, exchange/0, connection/0, user/0,
+              error/1, ok_or_error/1, ok/1]).
 
 -type(maybe(T) :: T | 'none').
 -type(vhost() :: binary()).
@@ -63,8 +64,8 @@
                properties_bin        :: maybe(binary()),
                payload_fragments_rev :: [binary()]}).
 -type(encoded_content() ::
-      #content{class_id              :: rabbit_framing:amqp_class_id(),
-               properties            :: maybe(rabbit_framing:amqp_property_record()),
+      #content{class_id       :: rabbit_framing:amqp_class_id(),
+               properties     :: maybe(rabbit_framing:amqp_property_record()),
                properties_bin        :: binary(),
                payload_fragments_rev :: [binary()]}).
 -type(content() :: undecoded_content() | decoded_content()).
@@ -93,20 +94,22 @@
                   explanation :: string(),
                   method      :: rabbit_framing:amqp_method_name()}).
 
--type(r(Kind) :: r2(vhost(), Kind)).
--type(r2(VirtualHost, Kind) :: r3(VirtualHost, Kind, rabbit_misc:resource_name())).
+-type(r(Kind) ::
+        r2(vhost(), Kind)).
+-type(r2(VirtualHost, Kind) ::
+        r3(VirtualHost, Kind, rabbit_misc:resource_name())).
 -type(r3(VirtualHost, Kind, Name) ::
-      #resource{virtual_host :: VirtualHost,
-                kind         :: Kind,
-                name         :: Name}).
+        #resource{virtual_host :: VirtualHost,
+                  kind         :: Kind,
+                  name         :: Name}).
 
 -type(ssl_socket() :: #ssl_socket{}).
 
 -type(listener() ::
       #listener{node     :: node(),
                 protocol :: atom(),
-                host     :: rabbit_net:hostname(),
-                port     :: rabbit_net:ip_port()}).
+                host     :: rabbit_networking:hostname(),
+                port     :: rabbit_networking:ip_port()}).
 
 -type(binding() ::
       #binding{exchange_name    :: rabbit_exchange:name(),
diff --git a/src/rabbit_writer.erl b/src/rabbit_writer.erl
index 2b3082bc..c5f7f547 100644
--- a/src/rabbit_writer.erl
+++ b/src/rabbit_writer.erl
@@ -49,27 +49,36 @@
 -ifdef(use_specs).
 
 -spec(start/3 ::
-        (rabbit_net:socket(), rabbit_channel:channel_number(), non_neg_integer())
+        (rabbit_net:socket(), rabbit_channel:channel_number(),
+         non_neg_integer())
         -> pid()).
 -spec(start_link/3 ::
-        (rabbit_net:socket(), rabbit_channel:channel_number(), non_neg_integer())
+        (rabbit_net:socket(), rabbit_channel:channel_number(),
+         non_neg_integer())
         -> pid()).
--spec(send_command/2 :: (pid(), rabbit_framing:amqp_method_record()) -> 'ok').
+-spec(send_command/2 ::
+        (pid(), rabbit_framing:amqp_method_record()) -> 'ok').
 -spec(send_command/3 ::
-        (pid(), rabbit_framing:amqp_method_record(), rabbit_types:content()) -> 'ok').
+        (pid(), rabbit_framing:amqp_method_record(), rabbit_types:content())
+        -> 'ok').
 -spec(send_command_and_signal_back/3 ::
         (pid(), rabbit_framing:amqp_method(), pid()) -> 'ok').
 -spec(send_command_and_signal_back/4 ::
-        (pid(), rabbit_framing:amqp_method(), rabbit_types:content(), pid()) -> 'ok').
+        (pid(), rabbit_framing:amqp_method(), rabbit_types:content(), pid())
+        -> 'ok').
 -spec(send_command_and_notify/5 ::
-        (pid(), pid(), pid(), rabbit_framing:amqp_method_record(), rabbit_types:content())
+        (pid(), pid(), pid(), rabbit_framing:amqp_method_record(),
+         rabbit_types:content())
         -> 'ok').
 -spec(internal_send_command/3 ::
-        (rabbit_net:socket(), rabbit_channel:channel_number(), rabbit_framing:amqp_method_record())
+        (rabbit_net:socket(), rabbit_channel:channel_number(),
+         rabbit_framing:amqp_method_record())
         -> 'ok').
 -spec(internal_send_command/5 ::
-        (rabbit_net:socket(), rabbit_channel:channel_number(), rabbit_framing:amqp_method_record(),
-         rabbit_types:content(), non_neg_integer()) -> 'ok').
+        (rabbit_net:socket(), rabbit_channel:channel_number(),
+         rabbit_framing:amqp_method_record(), rabbit_types:content(),
+         non_neg_integer())
+        -> 'ok').
 
 -endif.
 
diff --git a/src/supervisor2.erl b/src/supervisor2.erl
index 0b1d7265..03dc0f99 100644
--- a/src/supervisor2.erl
+++ b/src/supervisor2.erl
@@ -11,20 +11,20 @@
 %% All modifications are (C) 2010 LShift Ltd.
 %%
 %% %CopyrightBegin%
-%% 
+%%
 %% Copyright Ericsson AB 1996-2009. All Rights Reserved.
-%% 
+%%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
+%%
 %% %CopyrightEnd%
 %%
 -module(supervisor2).
diff --git a/src/vm_memory_monitor.erl b/src/vm_memory_monitor.erl
index 069c5a0f..bbc3a8c0 100644
--- a/src/vm_memory_monitor.erl
+++ b/src/vm_memory_monitor.erl
@@ -72,8 +72,10 @@
 
 -ifdef(use_specs).
 
--spec(start_link/1 :: (float()) ->
-             ('ignore' | rabbit_types:error(any()) | rabbit_types:ok(pid()))).
+-spec(start_link/1 ::
+        (float()) -> 'ignore' |
+                     rabbit_types:error(any()) |
+                     rabbit_types:ok(pid())).
 -spec(update/0 :: () -> 'ok').
 -spec(get_total_memory/0 :: () -> (non_neg_integer() | 'unknown')).
 -spec(get_vm_limit/0 :: () -> (non_neg_integer() | 'unknown')).
diff --git a/src/worker_pool.erl b/src/worker_pool.erl
index a1e94fa8..3105d5f9 100644
--- a/src/worker_pool.erl
+++ b/src/worker_pool.erl
@@ -52,7 +52,8 @@
 
 -ifdef(use_specs).
 
--spec(start_link/0 :: () -> rabbit_types:ok(pid()) | 'ignore' | rabbit_types:error(any())).
+-spec(start_link/0 ::
+        () -> rabbit_types:ok(pid()) | 'ignore' | rabbit_types:error(any())).
 -spec(submit/1 :: (fun (() -> A) | {atom(), atom(), [any()]}) -> A).
 -spec(submit_async/1 ::
       (fun (() -> any()) | {atom(), atom(), [any()]}) -> 'ok').
diff --git a/src/worker_pool_sup.erl b/src/worker_pool_sup.erl
index 3d9d5b16..220b4bad 100644
--- a/src/worker_pool_sup.erl
+++ b/src/worker_pool_sup.erl
@@ -41,9 +41,11 @@
 
 -ifdef(use_specs).
 
--spec(start_link/0 :: () -> rabbit_types:ok(pid()) | 'ignore' | rabbit_types:error(any())).
+-spec(start_link/0 ::
+        () -> rabbit_types:ok(pid()) | 'ignore' | rabbit_types:error(any())).
 -spec(start_link/1 ::
-        (non_neg_integer()) -> rabbit_types:ok(pid()) | 'ignore' | rabbit_types:error(any())).
+        (non_neg_integer())
+        -> rabbit_types:ok(pid()) | 'ignore' | rabbit_types:error(any())).
 
 -endif.
 
diff --git a/src/worker_pool_worker.erl b/src/worker_pool_worker.erl
index 6a14484e..a61e4cc3 100644
--- a/src/worker_pool_worker.erl
+++ b/src/worker_pool_worker.erl
@@ -44,7 +44,8 @@
 
 -ifdef(use_specs).
 
--spec(start_link/1 :: (any()) -> {'ok', pid()} | 'ignore' | rabbit_types:error(any())).
+-spec(start_link/1 ::
+        (any()) -> {'ok', pid()} | 'ignore' | rabbit_types:error(any())).
 -spec(submit/2 :: (pid(), fun (() -> A) | {atom(), atom(), [any()]}) -> A).
 -spec(submit_async/2 ::
       (pid(), fun (() -> any()) | {atom(), atom(), [any()]}) -> 'ok').