Skip to content

Commit

Permalink
Small documentation changes
Browse files Browse the repository at this point in the history
I'm leaving the Sized kind undocumented since it isn't fully implemented
yet.
  • Loading branch information
sfackler committed Jul 2, 2013
1 parent 451c943 commit 3e265e7
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 deletions.
3 changes: 0 additions & 3 deletions doc/rust.md
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions src/libstd/bool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/kinds.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3e265e7

Please sign in to comment.