diff options
| author | bors <bors@rust-lang.org> | 2016-09-30 11:08:58 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-30 11:08:58 -0700 |
| commit | 50932b5f4e3a5f1b6c955100da5b30d77bcd29d3 (patch) | |
| tree | dbce305f5d8ea4c390a3aa27831a7756e6b22981 /src/doc/reference.md | |
| parent | 954873055a998a06841ac19b39b1fe18a6641731 (diff) | |
| parent | af1df9880f603320bde62c8786f2208d659ce8ae (diff) | |
| download | rust-50932b5f4e3a5f1b6c955100da5b30d77bcd29d3.tar.gz rust-50932b5f4e3a5f1b6c955100da5b30d77bcd29d3.zip | |
Auto merge of #36864 - steveklabnik:rollup, r=steveklabnik
Rollup of 13 pull requests - Successful merges: #36529, #36535, #36576, #36623, #36711, #36750, #36810, #36829, #36833, #36841, #36842, #36851, #36860 - Failed merges:
Diffstat (limited to 'src/doc/reference.md')
| -rw-r--r-- | src/doc/reference.md | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/doc/reference.md b/src/doc/reference.md index b72c3743a69..20970ab7a35 100644 --- a/src/doc/reference.md +++ b/src/doc/reference.md @@ -3959,6 +3959,16 @@ the top-level type for the implementation of the called method. If no such metho found, `.deref()` is called and the compiler continues to search for the method implementation in the returned type `U`. +## The `Send` trait + +The `Send` trait indicates that a value of this type is safe to send from one +thread to another. + +## The 'Sync' trait + +The 'Sync' trait indicates that a value of this type is safe to share between +multiple threads. + # Memory model A Rust program's memory consists of a static set of *items* and a *heap*. |