aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2014-02-14 15:53:18 +0100
committerHenrik Nord <[email protected]>2014-02-14 15:53:33 +0100
commita3ce0c1ed7a907ad8d110bef33b5206480bd6a97 (patch)
tree95b75d6327060abc04783f106daefdf3221aef73 /lib/stdlib
parent6c9fa95961fcd8737fc14d75e904641c1e605440 (diff)
parenta5412706f4185fddbac29216a49affd1e9f11da0 (diff)
downloadotp-a3ce0c1ed7a907ad8d110bef33b5206480bd6a97.tar.gz
otp-a3ce0c1ed7a907ad8d110bef33b5206480bd6a97.tar.bz2
otp-a3ce0c1ed7a907ad8d110bef33b5206480bd6a97.zip
Merge branch 'calebh/fix-regestry-type-annotation'
* calebh/fix-regestry-type-annotation: Fix alternative registry type annotations in supervisor OTP-11707
Diffstat (limited to 'lib/stdlib')
-rw-r--r--lib/stdlib/src/supervisor.erl5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/stdlib/src/supervisor.erl b/lib/stdlib/src/supervisor.erl
index d18387568d..974583bc28 100644
--- a/lib/stdlib/src/supervisor.erl
+++ b/lib/stdlib/src/supervisor.erl
@@ -45,10 +45,13 @@
-type restart() :: 'permanent' | 'transient' | 'temporary'.
-type shutdown() :: 'brutal_kill' | timeout().
-type worker() :: 'worker' | 'supervisor'.
--type sup_name() :: {'local', Name :: atom()} | {'global', Name :: atom()}.
+-type sup_name() :: {'local', Name :: atom()}
+ | {'global', Name :: atom()}
+ | {'via', Module :: module(), Name :: any()}.
-type sup_ref() :: (Name :: atom())
| {Name :: atom(), Node :: node()}
| {'global', Name :: atom()}
+ | {'via', Module :: module(), Name :: any()}
| pid().
-type child_spec() :: {Id :: child_id(),
StartFunc :: mfargs(),