diff options
author | Hans Bolinder <[email protected]> | 2015-01-15 11:50:54 +0100 |
---|---|---|
committer | Hans Bolinder <[email protected]> | 2015-01-15 11:50:54 +0100 |
commit | 249ea23892ee75f157b435b9edd1d8123d2474da (patch) | |
tree | 9d9c4be0aadfcff6f137380259b93d87b5da17e5 /system | |
parent | 78a6bc3476fdf324a2140c04a42d003a0e9137ea (diff) | |
parent | 25ab719cfaf42d196287fec2171bf3eefb845b62 (diff) | |
download | otp-249ea23892ee75f157b435b9edd1d8123d2474da.tar.gz otp-249ea23892ee75f157b435b9edd1d8123d2474da.tar.bz2 otp-249ea23892ee75f157b435b9edd1d8123d2474da.zip |
Merge branch 'hb/dialyzer/suppress_warning/OTP-10280'
* hb/dialyzer/suppress_warning/OTP-10280:
dialyzer: Introduce module local suppression of warnings
Diffstat (limited to 'system')
-rw-r--r-- | system/doc/reference_manual/modules.xml | 3 | ||||
-rw-r--r-- | system/doc/reference_manual/typespec.xml | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/system/doc/reference_manual/modules.xml b/system/doc/reference_manual/modules.xml index 5fc8b363f8..5cb0c11371 100644 --- a/system/doc/reference_manual/modules.xml +++ b/system/doc/reference_manual/modules.xml @@ -194,8 +194,7 @@ behaviour_info(callbacks) -> Callbacks.</pre> </p> <pre> -type my_type() :: atom() | integer(). --spec my_function(integer()) -> integer(). - </pre> +-spec my_function(integer()) -> integer().</pre> <p>Read more in <seealso marker="typespec">Types and Function specifications</seealso>. </p> <p> diff --git a/system/doc/reference_manual/typespec.xml b/system/doc/reference_manual/typespec.xml index e4aa2ceda6..d1584d2b98 100644 --- a/system/doc/reference_manual/typespec.xml +++ b/system/doc/reference_manual/typespec.xml @@ -264,8 +264,10 @@ its violation results in a compilation error. </p> <note> - The following built-in list types also exist, - but they are expected to be rarely used. Hence, they have long names: + <p> + The following built-in list types also exist, + but they are expected to be rarely used. Hence, they have long names: + </p> </note> <pre> nonempty_maybe_improper_list() :: nonempty_maybe_improper_list(any(), any()) @@ -504,7 +506,9 @@ -spec foo({X, integer()}) -> X when X :: atom() ; ([Y]) -> Y when Y :: number().</pre> <note> + <p> For backwards compatibility the following form is also allowed: + </p> <pre> -spec id(X) -> X when is_subtype(X, tuple()).</pre> <p> but its use is discouraged. It will be taken out in a future |