aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/src
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2019-06-03 11:34:53 +0200
committerErlang/OTP <[email protected]>2019-06-03 11:34:53 +0200
commit69e8891b678d843aaedf14212d40cc7cb9d2807b (patch)
tree5cdb7a780da33f57d60b395e7ba8d138259873c4 /lib/kernel/src
parentd53b5fe6fec0e01f5c807256680710c45159e2d2 (diff)
parent17cf40f734346f67b4d0b708974768f81bc83d2b (diff)
downloadotp-69e8891b678d843aaedf14212d40cc7cb9d2807b.tar.gz
otp-69e8891b678d843aaedf14212d40cc7cb9d2807b.tar.bz2
otp-69e8891b678d843aaedf14212d40cc7cb9d2807b.zip
Merge branch 'sverker/seq-trace-label-old-heap-bug/ERL-700/OTP-15849/OTP-15858/OTP-15859' into maint-21
* sverker/seq-trace-label-old-heap-bug/ERL-700/OTP-15849/OTP-15858/OTP-15859: erts: Fix faulty spec for seq_trace:set_token/2 erts: Fix seq_trace:print/2 for arbitrary labels erts: Fix bug in seq_trace:set_token(label,_)
Diffstat (limited to 'lib/kernel/src')
-rw-r--r--lib/kernel/src/seq_trace.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/kernel/src/seq_trace.erl b/lib/kernel/src/seq_trace.erl
index 4f9d7b3e5c..f0bd1fabe9 100644
--- a/lib/kernel/src/seq_trace.erl
+++ b/lib/kernel/src/seq_trace.erl
@@ -59,7 +59,7 @@ set_token({Flags,Label,Serial,_From,Lastcnt}) ->
F = decode_flags(Flags),
set_token2([{label,Label},{serial,{Lastcnt, Serial}} | F]).
--spec set_token(Component, Val) -> {Component, OldVal} when
+-spec set_token(Component, Val) -> OldVal when
Component :: component(),
Val :: value(),
OldVal :: value().