diff options
| author | Hans Bolinder <[email protected]> | 2017-05-22 15:22:19 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2017-05-22 15:22:19 +0200 |
| commit | 7247cb6fa047ca7c968b88f279832f39ea0b04f7 (patch) | |
| tree | 8cfc7b87f86d406410ae7cfafb7389c8edfd29f8 | |
| parent | 036534e03edded03c3392a30cda189bca8dfacf5 (diff) | |
| parent | 0ec564035fb5de2c42ebb69be1d61933c79b4019 (diff) | |
| download | otp-7247cb6fa047ca7c968b88f279832f39ea0b04f7.tar.gz otp-7247cb6fa047ca7c968b88f279832f39ea0b04f7.tar.bz2 otp-7247cb6fa047ca7c968b88f279832f39ea0b04f7.zip | |
Merge branch 'hasse/dialyzer/fix_type_variable_bug/OTP-14423'
* hasse/dialyzer/fix_type_variable_bug/OTP-14423:
dialyzer: Warn for bad type variables of parameterized types
mnesia: Correct a type declaration
| -rw-r--r-- | lib/hipe/cerl/erl_types.erl | 4 | ||||
| -rw-r--r-- | lib/mnesia/src/mnesia.erl | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/hipe/cerl/erl_types.erl b/lib/hipe/cerl/erl_types.erl index ea8cc1677d..4cfa80f153 100644 --- a/lib/hipe/cerl/erl_types.erl +++ b/lib/hipe/cerl/erl_types.erl @@ -5171,9 +5171,9 @@ cache_put(Key, Type, DeltaL, #cache{types = Types} = Cache) -> NewTypes = maps:put(Key, {Type, DeltaL}, Types), Cache#cache{types = NewTypes}. --spec t_var_names([erl_type()]) -> [atom()]. +-spec t_var_names([parse_form()]) -> [atom()]. -t_var_names([{var, _, Name}|L]) when L =/= '_' -> +t_var_names([{var, _, Name}|L]) when Name =/= '_' -> [Name|t_var_names(L)]; t_var_names([]) -> []. diff --git a/lib/mnesia/src/mnesia.erl b/lib/mnesia/src/mnesia.erl index dece995d39..3b771e8c5b 100644 --- a/lib/mnesia/src/mnesia.erl +++ b/lib/mnesia/src/mnesia.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2016. All Rights Reserved. +%% Copyright Ericsson AB 1996-2017. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -166,7 +166,7 @@ -type select_continuation() :: term(). -type snmp_struct() :: [{atom(), snmp_type() | tuple_of(snmp_type())}]. -type snmp_type() :: 'fix_string' | 'string' | 'integer'. --type tuple_of(_) :: tuple(). +-type tuple_of(_T) :: tuple(). -define(DEFAULT_ACCESS, ?MODULE). |