Skip to content

Commit 88e383e

Browse files
committed
auto merge of #10419 : brson/rust/conditiondocs, r=alexcrichton
Fixes #8553 by just not mentioning TLS, and instead just referring to the 'task-local condition handler'.
2 parents 23746ae + e348343 commit 88e383e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

doc/tutorial-conditions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ The `raise` method maps a value of the condition's input type to its output type
351351
The input type should therefore convey all relevant information to the condition handler.
352352
The output type should convey all relevant information _for continuing execution at the site of error_.
353353
When the error site raises a condition handler,
354-
the `Condition::raise` method searches task-local storage (TLS) for the innermost installed _handler_,
354+
the `Condition::raise` method searches for the innermost installed task-local condition _handler_,
355355
and if any such handler is found, calls it with the provided input value.
356356
If no handler is found, `Condition::raise` will fail the task with an appropriate error message.
357357

0 commit comments

Comments
 (0)