summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2010-09-08 23:24:49 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2010-09-08 23:24:49 +0100
commit5a0b1b6ac95d70743dc6c2361e5378a874b3c7c8 (patch)
tree2b74b8837d20575374d85d9f4e8708a8009c08f2
parenta88163e4a07fbbdef2010c0308ce7d7ab9dd5c40 (diff)
downloadrabbitmq-server-5a0b1b6ac95d70743dc6c2361e5378a874b3c7c8.tar.gz
correct some types
-rw-r--r--src/rabbit_net.erl2
-rw-r--r--src/rabbit_types.erl4
2 files changed, 2 insertions, 4 deletions
diff --git a/src/rabbit_net.erl b/src/rabbit_net.erl
index 6c5e6564..2286896b 100644
--- a/src/rabbit_net.erl
+++ b/src/rabbit_net.erl
@@ -46,7 +46,7 @@
'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()).
+-type(socket() :: port() | #ssl_socket{}).
-spec(async_recv/3 ::
(socket(), integer(), timeout()) -> rabbit_types:ok(any())).
diff --git a/src/rabbit_types.erl b/src/rabbit_types.erl
index 9dfd33bd..35b08ae9 100644
--- a/src/rabbit_types.erl
+++ b/src/rabbit_types.erl
@@ -38,7 +38,7 @@
-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,
+ amqp_error/0, r/1, r2/2, r3/3, listener/0,
binding/0, amqqueue/0, exchange/0, connection/0, protocol/0,
user/0, ok/1, error/1, ok_or_error/1, ok_or_error2/2,
ok_pid_or_error/0, channel_exit/0, connection_exit/0]).
@@ -107,8 +107,6 @@
kind :: Kind,
name :: Name}).
--type(ssl_socket() :: #ssl_socket{}).
-
-type(listener() ::
#listener{node :: node(),
protocol :: atom(),