Skip to content

Commit

Permalink
Remove references to ~[] in core::kinds::marker docs.
Browse files Browse the repository at this point in the history
  • Loading branch information
nham committed Aug 5, 2014
1 parent fd02916 commit 8650040
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/libcore/kinds.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
///
Expand Down

5 comments on commit 8650040

@bors
Copy link
Contributor

@bors bors commented on 8650040 Aug 6, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from steveklabnik
at nham@8650040

@bors
Copy link
Contributor

@bors bors commented on 8650040 Aug 6, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging nham/rust/fix_marker_docs = 8650040 into auto

@bors
Copy link
Contributor

@bors bors commented on 8650040 Aug 6, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nham/rust/fix_marker_docs = 8650040 merged ok, testing candidate = 8fcfd02

@bors
Copy link
Contributor

@bors bors commented on 8650040 Aug 6, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 8fcfd02

Please sign in to comment.