auto merge of #16280 : cburgdorf/rust/patch-3, r=steveklabnik

This commit is contained in:
bors 2014-08-20 23:06:02 +00:00
commit 33037fd23b

View File

@ -1076,7 +1076,7 @@ Finally, Rust has a "sum type", an **enum**. Enums are an incredibly useful
feature of Rust, and are used throughout the standard library. Enums look feature of Rust, and are used throughout the standard library. Enums look
like this: like this:
``` ```{rust}
enum Ordering { enum Ordering {
Less, Less,
Equal, Equal,
@ -1088,7 +1088,7 @@ This is an enum that is provided by the Rust standard library. An `Ordering`
can only be _one_ of `Less`, `Equal`, or `Greater` at any given time. Here's can only be _one_ of `Less`, `Equal`, or `Greater` at any given time. Here's
an example: an example:
```rust ```{rust}
fn cmp(a: int, b: int) -> Ordering { fn cmp(a: int, b: int) -> Ordering {
if a < b { Less } if a < b { Less }
else if a > b { Greater } else if a > b { Greater }
@ -1155,7 +1155,7 @@ gotten there yet!
You can have any number of values in an enum: You can have any number of values in an enum:
``` ```{rust}
enum OptionalColor { enum OptionalColor {
Color(int, int, int), Color(int, int, int),
Missing Missing
@ -1652,7 +1652,7 @@ a full line of input. Nice and easy.
Do you remember this code? Do you remember this code?
``` ```{rust}
enum OptionalInt { enum OptionalInt {
Value(int), Value(int),
Missing, Missing,