about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2016-09-30 13:44:48 -0400
committerGitHub <noreply@github.com>2016-09-30 13:44:48 -0400
commitaf1df9880f603320bde62c8786f2208d659ce8ae (patch)
tree11e3b717ad5cba0eade18af041747dc6cd9d49fc
parentebd1ad3fbb31a5fcce3de5ed4f02c3c618687f4f (diff)
parenta5244dd66c873f140406c4498c3c5c7615c3d1ee (diff)
Rollup merge of #36860 - wesleywiser:patch-2, r=Manishearth
Add `Send` and `Sync` traits to the reference

Fixes #36859
-rw-r--r--src/doc/reference.md10
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*.