diff options
| author | bors <bors@rust-lang.org> | 2013-07-04 19:01:54 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-07-04 19:01:54 -0700 |
| commit | e89dcb887b99dc8c04d2863e906a4b2705959159 (patch) | |
| tree | 2474230bd43b32aab6e49e44df5b327f743a711c /src/libstd | |
| parent | b055a10662ecc77db518cb1dc3561a8bde67c47c (diff) | |
| parent | c63b3f8e285b39349f198eca15ec252a2c8938db (diff) | |
| download | rust-e89dcb887b99dc8c04d2863e906a4b2705959159.tar.gz rust-e89dcb887b99dc8c04d2863e906a4b2705959159.zip | |
auto merge of #7549 : sfackler/rust/docs, r=msullivan
I'm leaving the Sized kind undocumented since it isn't fully implemented yet.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/bool.rs | 1 | ||||
| -rw-r--r-- | src/libstd/kinds.rs | 2 |
2 files changed, 2 insertions, 1 deletions
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 |