aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2011-05-23 16:49:47 +0200
committerHans Bolinder <[email protected]>2011-05-23 16:49:47 +0200
commit35978c047c6cd2758920b5d44937af66a3b0ea87 (patch)
treea53efe84c86c846d0417172376791e3ee68468fa
parentad5a1519e74d79218c0dd2ef79a39d75bd0155bf (diff)
parent3c41b96f85bda38d1859f48ededd9c0d8001c028 (diff)
downloadotp-35978c047c6cd2758920b5d44937af66a3b0ea87.tar.gz
otp-35978c047c6cd2758920b5d44937af66a3b0ea87.tar.bz2
otp-35978c047c6cd2758920b5d44937af66a3b0ea87.zip
Merge branch 'hb/stdlib/spec_fix/OTP-9333' into dev
* hb/stdlib/spec_fix/OTP-9333: Fix a spec and a type
-rw-r--r--lib/stdlib/src/erl_eval.erl2
-rw-r--r--lib/stdlib/src/slave.erl2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/stdlib/src/erl_eval.erl b/lib/stdlib/src/erl_eval.erl
index 46288cf467..515ea2ebb7 100644
--- a/lib/stdlib/src/erl_eval.erl
+++ b/lib/stdlib/src/erl_eval.erl
@@ -43,7 +43,7 @@
-type(name() :: term()).
-type(value() :: term()).
-type(bindings() :: [{name(), value()}]).
--opaque(binding_struct() :: orddict:orddict()).
+-type(binding_struct() :: orddict:orddict()).
-type(lfun_value_handler() :: fun((Name :: atom(),
Arguments :: [term()]) ->
diff --git a/lib/stdlib/src/slave.erl b/lib/stdlib/src/slave.erl
index d79ee676d9..de0179da59 100644
--- a/lib/stdlib/src/slave.erl
+++ b/lib/stdlib/src/slave.erl
@@ -72,7 +72,7 @@ start_pseudo(_,_,_) -> ok. %% It's already there
%% This relay can be used to relay all messages directed to a process.
--spec relay(Pid) -> none() when
+-spec relay(Pid) -> no_return() when
Pid :: pid().
relay({badrpc,Reason}) ->