about summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-05-21 08:19:17 +0000
committerbors <bors@rust-lang.org>2015-05-21 08:19:17 +0000
commitd3543099d60d2bc68491ffd9691d4ee5d7f9d082 (patch)
tree4bed2b3b2d93b2f71583f65dcb1e2034a5bbd979 /src/libcore
parent4423748eb85c98df3baccd8f1178bc10d7180119 (diff)
parent06d343b691439e363be26c36cbf4484027309793 (diff)
downloadrust-d3543099d60d2bc68491ffd9691d4ee5d7f9d082.tar.gz
rust-d3543099d60d2bc68491ffd9691d4ee5d7f9d082.zip
Auto merge of #25671 - Manishearth:rollup, r=Manishearth
- Successful merges: #25648, #25659, #25661, #25665
- Failed merges: 
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/marker.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libcore/marker.rs b/src/libcore/marker.rs
index 5909c5cc30e..86e91df38ab 100644
--- a/src/libcore/marker.rs
+++ b/src/libcore/marker.rs
@@ -120,11 +120,10 @@ pub trait Unsize<T> {
 /// ```
 ///
 /// The `PointList` `struct` cannot implement `Copy`, because `Vec<T>` is not `Copy`. If we
-/// attempt to derive a `Copy` implementation, we'll get an error.
+/// attempt to derive a `Copy` implementation, we'll get an error:
 ///
 /// ```text
-/// error: the trait `Copy` may not be implemented for this type; field `points` does not implement
-/// `Copy`
+/// the trait `Copy` may not be implemented for this type; field `points` does not implement `Copy`
 /// ```
 ///
 /// ## How can I implement `Copy`?