From 3e265e784225a6f74c21dd3cc8cc0a28947dddba Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Mon, 1 Jul 2013 23:37:11 -0700 Subject: [PATCH] Small documentation changes I'm leaving the Sized kind undocumented since it isn't fully implemented yet. --- doc/rust.md | 3 --- src/libstd/bool.rs | 1 + src/libstd/kinds.rs | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/doc/rust.md b/doc/rust.md index cc53d7d17a2..c61cbe6476c 100644 --- a/doc/rust.md +++ b/doc/rust.md @@ -2869,9 +2869,6 @@ The kinds are: : Types of this kind can be safely sent between tasks. This kind includes scalars, owning pointers, owned closures, and structural types containing only other owned types. All `Send` types are `Static`. -`Static` - : Types of this kind do not contain any borrowed pointers; - this can be a useful guarantee for code that breaks borrowing assumptions using [`unsafe` operations](#unsafe-functions). `Copy` : This kind includes all types that can be copied. All types with sendable kind are copyable, as are managed boxes, managed closures, diff --git a/src/libstd/bool.rs b/src/libstd/bool.rs index e6be164099b..b0b586df4b5 100644 --- a/src/libstd/bool.rs +++ b/src/libstd/bool.rs @@ -122,6 +122,7 @@ pub fn xor(a: bool, b: bool) -> bool { (a && !b) || (!a && b) } * ~~~ {.rust} * rusti> std::bool::implies(true, true) * true +* ~~~ * * ~~~ {.rust} * rusti> std::bool::implies(true, false) diff --git a/src/libstd/kinds.rs b/src/libstd/kinds.rs index f350e106168..6c16ecc0d4e 100644 --- a/src/libstd/kinds.rs +++ b/src/libstd/kinds.rs @@ -18,7 +18,7 @@ intrinsic properties of the type. These classifications, often called They cannot be implemented by user code, but are instead implemented by the compiler automatically for the types to which they apply. -The 4 kinds are +The 3 kinds are * Copy - types that may be copied without allocation. This includes scalar types and managed pointers, and exludes owned pointers. It