aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/src
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2016-07-19 14:46:43 +0200
committerRaimo Niskanen <[email protected]>2016-07-19 14:46:43 +0200
commit9cdf92fc35006d34d7029ef0fc34c0daf9e1330b (patch)
tree932ac6498e9d30138284be3a464316dc0bf4b35e /lib/stdlib/src
parent01a46375d8aae78d4ad01c043b554e58c5b40768 (diff)
parent7c10598da79e28c9b802029d94269cbebba2f21e (diff)
downloadotp-9cdf92fc35006d34d7029ef0fc34c0daf9e1330b.tar.gz
otp-9cdf92fc35006d34d7029ef0fc34c0daf9e1330b.tar.bz2
otp-9cdf92fc35006d34d7029ef0fc34c0daf9e1330b.zip
Merge branch 'maint'
Diffstat (limited to 'lib/stdlib/src')
-rw-r--r--lib/stdlib/src/gen_statem.erl13
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/stdlib/src/gen_statem.erl b/lib/stdlib/src/gen_statem.erl
index 23bddafeed..c02e6a1a19 100644
--- a/lib/stdlib/src/gen_statem.erl
+++ b/lib/stdlib/src/gen_statem.erl
@@ -219,9 +219,10 @@
OldState :: state(),
OldData :: data(),
Extra :: term()) ->
- {NewCallbackMode :: callback_mode(),
+ {CallbackMode :: callback_mode(),
NewState :: state(),
- NewData :: data()}.
+ NewData :: data()} |
+ (Reason :: term()).
%% Format the callback module state in some sensible that is
%% often condensed way. For StatusOption =:= 'normal' the perferred
@@ -630,11 +631,11 @@ system_code_change(
Result -> Result
end
of
- {NewCallbackMode,NewState,NewData} ->
- callback_mode(NewCallbackMode) orelse
- error({callback_mode,NewCallbackMode}),
+ {CallbackMode,NewState,NewData} ->
+ callback_mode(CallbackMode) orelse
+ error({callback_mode,CallbackMode}),
{ok,
- S#{callback_mode := NewCallbackMode,
+ S#{callback_mode := CallbackMode,
state := NewState,
data := NewData}};
{ok,_} = Error ->