about summary refs log tree commit diff
path: root/src/libstd/primitive_docs.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-04-06 13:44:51 -0700
committerbors <bors@rust-lang.org>2016-04-06 13:44:51 -0700
commitbf5da36f1dfae45941ec39ef67a41fdbd22c1a50 (patch)
treec019fe043d842df6d5e19c131d304cb541f7e7a8 /src/libstd/primitive_docs.rs
parent943ec3bdfc9ba28e94b6d00a2b53fb2cd8b21655 (diff)
parent862ae9aa75b073f4d753aa8275fb139ab9729d74 (diff)
downloadrust-bf5da36f1dfae45941ec39ef67a41fdbd22c1a50.tar.gz
rust-bf5da36f1dfae45941ec39ef67a41fdbd22c1a50.zip
Auto merge of #32778 - steveklabnik:rollup, r=steveklabnik
Rollup of 12 pull requests

- Successful merges: #31762, #32538, #32634, #32668, #32679, #32691, #32724, #32727, #32744, #32761, #32766, #32774
- Failed merges:
Diffstat (limited to 'src/libstd/primitive_docs.rs')
-rw-r--r--src/libstd/primitive_docs.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/libstd/primitive_docs.rs b/src/libstd/primitive_docs.rs
index c8ea28c5ca3..e083605a2ac 100644
--- a/src/libstd/primitive_docs.rs
+++ b/src/libstd/primitive_docs.rs
@@ -425,10 +425,11 @@ mod prim_str { }
 ///
 /// # Trait implementations
 ///
-/// If every type inside a tuple implements one of the following
-/// traits, then a tuple itself also implements it.
+/// If every type inside a tuple implements one of the following traits, then a
+/// tuple itself also implements it.
 ///
 /// * [`Clone`]
+/// * [`Copy`]
 /// * [`PartialEq`]
 /// * [`Eq`]
 /// * [`PartialOrd`]
@@ -438,6 +439,7 @@ mod prim_str { }
 /// * [`Hash`]
 ///
 /// [`Clone`]: clone/trait.Clone.html
+/// [`Copy`]: marker/trait.Copy.html
 /// [`PartialEq`]: cmp/trait.PartialEq.html
 /// [`Eq`]: cmp/trait.Eq.html
 /// [`PartialOrd`]: cmp/trait.PartialOrd.html