aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2011-06-01 09:33:31 +0200
committerHans Bolinder <[email protected]>2011-06-01 09:33:31 +0200
commit79ec75a2586d3ce89691facb44720eab8921f485 (patch)
tree4394acd9c5d7a344bc23e9f22a8e6c1af9c9844c
parentf6a77186a608fb08e2ffc65d06c4166b7127e4a0 (diff)
parenta8c0e1d9810f6f4f4b5c63428adfc9ec06c3cd58 (diff)
downloadotp-79ec75a2586d3ce89691facb44720eab8921f485.tar.gz
otp-79ec75a2586d3ce89691facb44720eab8921f485.tar.bz2
otp-79ec75a2586d3ce89691facb44720eab8921f485.zip
Merge branch 'hb/edoc/no_return/OTP-9350' into dev
* hb/edoc/no_return/OTP-9350: Add no_return to the built-in types
-rw-r--r--lib/edoc/src/edoc_specs.erl2
-rw-r--r--lib/edoc/src/edoc_types.erl1
-rw-r--r--lib/edoc/src/edoc_wiki.erl5
3 files changed, 2 insertions, 6 deletions
diff --git a/lib/edoc/src/edoc_specs.erl b/lib/edoc/src/edoc_specs.erl
index 519ade726f..79a5d142bc 100644
--- a/lib/edoc/src/edoc_specs.erl
+++ b/lib/edoc/src/edoc_specs.erl
@@ -305,8 +305,6 @@ d2e({ann_type,_,[V, T0]}) ->
%% layout module.
T = d2e(T0),
?add_t_ann(T, element(3, V));
-d2e({type,_,no_return,[]}) ->
- #t_type{name = #t_name{name = none}};
d2e({remote_type,_,[{atom,_,M},{atom,_,F},Ts0]}) ->
Ts = d2e(Ts0),
typevar_anno(#t_type{name = #t_name{module = M, name = F}, args = Ts}, Ts);
diff --git a/lib/edoc/src/edoc_types.erl b/lib/edoc/src/edoc_types.erl
index 1ded63dffe..e784b3359a 100644
--- a/lib/edoc/src/edoc_types.erl
+++ b/lib/edoc/src/edoc_types.erl
@@ -51,6 +51,7 @@ is_predefined(list, 0) -> true;
is_predefined(list, 1) -> true;
is_predefined(nil, 0) -> true;
is_predefined(none, 0) -> true;
+is_predefined(no_return, 0) -> true;
is_predefined(number, 0) -> true;
is_predefined(pid, 0) -> true;
is_predefined(port, 0) -> true;
diff --git a/lib/edoc/src/edoc_wiki.erl b/lib/edoc/src/edoc_wiki.erl
index 9a31bc9a82..ba33198787 100644
--- a/lib/edoc/src/edoc_wiki.erl
+++ b/lib/edoc/src/edoc_wiki.erl
@@ -360,10 +360,7 @@ par_text(Cs, As, Bs, E, Es) ->
[] -> Bs;
_ -> [#xmlElement{name = p, content = Es1} | Bs]
end,
- Bs1 = case Ss of
- [] -> Bs0;
- _ -> [#xmlText{value = Ss} | Bs0]
- end,
+ Bs1 = [#xmlText{value = Ss} | Bs0],
case Cs2 of
[] ->
par(Es, [], Bs1);