diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-07 18:53:58 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-07 19:27:27 -0800 |
| commit | 0dc48b47a8c67eb28e7b89a6c0810dc9446377f7 (patch) | |
| tree | 6ecc7fd6e3031c1d57e85dd6612489903a595b71 /src/doc/guide-error-handling.md | |
| parent | 11e265c2e0af99a81caf888fc39cc903dc74f1cd (diff) | |
| download | rust-0dc48b47a8c67eb28e7b89a6c0810dc9446377f7.tar.gz rust-0dc48b47a8c67eb28e7b89a6c0810dc9446377f7.zip | |
Test fixes and rebase conflicts
Diffstat (limited to 'src/doc/guide-error-handling.md')
| -rw-r--r-- | src/doc/guide-error-handling.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/doc/guide-error-handling.md b/src/doc/guide-error-handling.md index d241e77f810..98b46511f04 100644 --- a/src/doc/guide-error-handling.md +++ b/src/doc/guide-error-handling.md @@ -147,10 +147,10 @@ for all but the most trivial of situations. Here's an example of using `Result`: ```rust -#[deriving(Show)] +#[derive(Show)] enum Version { Version1, Version2 } -#[deriving(Show)] +#[derive(Show)] enum ParseError { InvalidHeaderLength, InvalidVersion } fn parse_version(header: &[u8]) -> Result<Version, ParseError> { |