summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHubert Plociniczak <hubert@lshift.net>2008-09-02 13:01:19 +0100
committerHubert Plociniczak <hubert@lshift.net>2008-09-02 13:01:19 +0100
commit1eb954d164f75d7a29403657ef1a9c983a049580 (patch)
treeec92c440435b6faf3dac7463e594f9fb7bc8bb34
parent86c1663dda5a65a7b281f53f571acea7679d43de (diff)
downloadrabbitmq-server-1eb954d164f75d7a29403657ef1a9c983a049580.tar.gz
Better naming for types
-rw-r--r--include/rabbit.hrl2
-rw-r--r--include/rabbit_framing_spec.hrl2
-rw-r--r--src/rabbit.erl3
-rw-r--r--src/rabbit_misc.erl2
4 files changed, 5 insertions, 4 deletions
diff --git a/include/rabbit.hrl b/include/rabbit.hrl
index b374f047..180a0dc3 100644
--- a/include/rabbit.hrl
+++ b/include/rabbit.hrl
@@ -71,7 +71,7 @@
-type(r(Kind) ::
#resource{virtual_host :: vhost(),
kind :: Kind,
- name :: binary_name()}).
+ name :: resource_name()}).
-type(queue_name() :: r('queue')).
-type(exchange_name() :: r('exchange')).
-type(user() ::
diff --git a/include/rabbit_framing_spec.hrl b/include/rabbit_framing_spec.hrl
index 6bd1cd91..e9e65092 100644
--- a/include/rabbit_framing_spec.hrl
+++ b/include/rabbit_framing_spec.hrl
@@ -46,7 +46,7 @@
-type(channel_number() :: non_neg_integer()).
%% TODO: make this more precise
-type(amqp_error() :: {bool(), non_neg_integer(), binary()}).
--type(binary_name() :: binary()).
+-type(resource_name() :: binary()).
-type(routing_key() :: binary()).
-type(username() :: binary()).
-type(password() :: binary()).
diff --git a/src/rabbit.erl b/src/rabbit.erl
index 1af550a3..779416e3 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -49,11 +49,12 @@
-ifdef(use_specs).
-type(log_location() :: 'tty' | 'undefined' | string()).
+-type(file_suffix() :: binary()).
-spec(start/0 :: () -> 'ok').
-spec(stop/0 :: () -> 'ok').
-spec(stop_and_halt/0 :: () -> 'ok').
--spec(rotate_logs/1 :: (binary_name()) -> 'ok' | {'error', any()}).
+-spec(rotate_logs/1 :: (file_suffix()) -> 'ok' | {'error', any()}).
-spec(status/0 :: () ->
[{running_applications, [{atom(), string(), string()}]} |
{nodes, [node()]} |
diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl
index cf6a483a..db6da45c 100644
--- a/src/rabbit_misc.erl
+++ b/src/rabbit_misc.erl
@@ -68,7 +68,7 @@
-spec(get_config/2 :: (atom(), A) -> A).
-spec(set_config/2 :: (atom(), any()) -> 'ok').
-spec(dirty_read/1 :: ({atom(), any()}) -> {'ok', any()} | not_found()).
--spec(r/3 :: (vhost(), K, binary_name()) -> r(K) when is_subtype(K, atom())).
+-spec(r/3 :: (vhost(), K, resource_name()) -> r(K) when is_subtype(K, atom())).
-spec(r/2 :: (vhost(), K) -> #resource{virtual_host :: vhost(),
kind :: K,
name :: '_'}