about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-08-06 13:21:27 +0000
committerbors <bors@rust-lang.org>2014-08-06 13:21:27 +0000
commit8fcfd02d852cc328a1d465f366ff8e22583b26f2 (patch)
tree8a68e0eb4e718efb4ca5f508c3de6ec862975499
parentb09a02b41588b2348fcce89c37c4a2cdc614d350 (diff)
parent8650040b8a2d248a2ea4e31dd63e26f38af2c560 (diff)
downloadrust-8fcfd02d852cc328a1d465f366ff8e22583b26f2.tar.gz
rust-8fcfd02d852cc328a1d465f366ff8e22583b26f2.zip
auto merge of #16276 : nham/rust/fix_marker_docs, r=steveklabnik
-rw-r--r--src/libcore/kinds.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libcore/kinds.rs b/src/libcore/kinds.rs
index f6a88b34196..958a2ba02f6 100644
--- a/src/libcore/kinds.rs
+++ b/src/libcore/kinds.rs
@@ -125,7 +125,7 @@ pub mod marker {
     ///
     /// The type system would currently infer that the value of
     /// the type parameter `T` is irrelevant, and hence a `S<int>` is
-    /// a subtype of `S<~[int]>` (or, for that matter, `S<U>` for
+    /// a subtype of `S<Box<int>>` (or, for that matter, `S<U>` for
     /// any `U`). But this is incorrect because `get()` converts the
     /// `*()` into a `*T` and reads from it. Therefore, we should include the
     /// a marker field `CovariantType<T>` to inform the type checker that
@@ -166,7 +166,7 @@ pub mod marker {
     ///
     /// The type system would currently infer that the value of
     /// the type parameter `T` is irrelevant, and hence a `S<int>` is
-    /// a subtype of `S<~[int]>` (or, for that matter, `S<U>` for
+    /// a subtype of `S<Box<int>>` (or, for that matter, `S<U>` for
     /// any `U`). But this is incorrect because `get()` converts the
     /// `*()` into a `fn(T)` and then passes a value of type `T` to it.
     ///