diff options
| author | bors <bors@rust-lang.org> | 2020-04-03 13:42:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-03 13:42:08 +0000 |
| commit | f6fe99c798cb65280a9a56f442b371adcb7b8aa2 (patch) | |
| tree | c35a82154a7b29f313d43ce08a69616c585231fd /src/liballoc | |
| parent | 34f7f55e7aad1cedbddf6fecb4f293377d0cfd1d (diff) | |
| parent | 04824f302a9d28e6437d2ad0749c9e3cc4f36b9e (diff) | |
| download | rust-f6fe99c798cb65280a9a56f442b371adcb7b8aa2.tar.gz rust-f6fe99c798cb65280a9a56f442b371adcb7b8aa2.zip | |
Auto merge of #70734 - Dylan-DPC:rollup-xmncatq, r=Dylan-DPC
Rollup of 6 pull requests Successful merges: - #70696 (Extend #69020 test to include reversed operand order.) - #70706 (Minor cleanup in rustdoc --check-theme) - #70725 (Avoid `.unwrap()`s on `.span_to_snippet(...)`s) - #70728 (Minor doc improvements on `AllocRef`) - #70730 (Fix link in task::Wake docs) - #70731 (Minor follow-up after renaming librustc(_middle)) Failed merges: r? @ghost
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/task.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/liballoc/task.rs b/src/liballoc/task.rs index 981095302c7..a64d5d7a63b 100644 --- a/src/liballoc/task.rs +++ b/src/liballoc/task.rs @@ -12,10 +12,12 @@ use crate::sync::Arc; /// to the tasks that are executed on that executor. /// /// This trait is a memory-safe and ergonomic alternative to constructing a -/// [`RawWaker`]. It supports the common executor design in which the data -/// used to wake up a task is stored in an [`Arc`]. Some executors (especially +/// [`RawWaker`]. It supports the common executor design in which the data used +/// to wake up a task is stored in an [`Arc`][arc]. Some executors (especially /// those for embedded systems) cannot use this API, which is why [`RawWaker`] /// exists as an alternative for those systems. +/// +/// [arc]: ../../std/sync/struct.Arc.html #[unstable(feature = "wake_trait", issue = "69912")] pub trait Wake { /// Wake this task. |