diff options
| author | bors <bors@rust-lang.org> | 2015-09-16 05:48:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-09-16 05:48:49 +0000 |
| commit | 1fe126af2ec65eb0dc49cdfecd437d422c68c686 (patch) | |
| tree | 0148835bea6e25a34e68292a4b909a06ff4cf719 | |
| parent | 0f1f5fc746919b15e619cfcfd4cd939ef47f58bd (diff) | |
| parent | e66a1dcde9dbfe8139d1a6e292964144ceac6632 (diff) | |
| download | rust-1fe126af2ec65eb0dc49cdfecd437d422c68c686.tar.gz rust-1fe126af2ec65eb0dc49cdfecd437d422c68c686.zip | |
Auto merge of #28420 - christopherdumas:intergrate_error_burnstushi, r=steveklabnik
This was pointed out by @filsmick and @swatteau in #28412.
| -rw-r--r-- | src/doc/trpl/error-handling.md | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/doc/trpl/error-handling.md b/src/doc/trpl/error-handling.md index 673dc950ecc..e335d59b192 100644 --- a/src/doc/trpl/error-handling.md +++ b/src/doc/trpl/error-handling.md @@ -24,7 +24,7 @@ systems may want to jump around. * [The Basics](#the-basics) * [Unwrapping explained](#unwrapping-explained) * [The `Option` type](#the-option-type) - * [Composing `Option<T>` values](#composing-optiont-values) + * [Composing `Option<T>` values](#composing-option<t>-values) * [The `Result` type](#the-result-type) * [Parsing integers](#parsing-integers) * [The `Result` type alias idiom](#the-result-type-alias-idiom) @@ -33,19 +33,19 @@ systems may want to jump around. * [Composing `Option` and `Result`](#composing-option-and-result) * [The limits of combinators](#the-limits-of-combinators) * [Early returns](#early-returns) - * [The `try!` macro](#the-try-macro) + * [The `try!` macro](#the-try!-macro) * [Defining your own error type](#defining-your-own-error-type) * [Standard library traits used for error handling](#standard-library-traits-used-for-error-handling) * [The `Error` trait](#the-error-trait) * [The `From` trait](#the-from-trait) - * [The real `try!` macro](#the-real-try-macro) + * [The real `try!` macro](#the-real-try!-macro) * [Composing custom error types](#composing-custom-error-types) * [Advice for library writers](#advice-for-library-writers) * [Case study: A program to read population data](#case-study-a-program-to-read-population-data) * [Initial setup](#initial-setup) * [Argument parsing](#argument-parsing) * [Writing the logic](#writing-the-logic) - * [Error handling with `Box<Error>`](#error-handling-with-boxerror) + * [Error handling with `Box<Error>`](#error-handling-with-box<error>) * [Reading from stdin](#reading-from-stdin) * [Error handling with a custom type](#error-handling-with-a-custom-type) * [Adding functionality](#adding-functionality) @@ -122,8 +122,7 @@ types. Both of these types have a method called `unwrap` defined on them. ## The `Option` type -The `Option` type is -[defined in the standard library][1]: +The `Option` type is [defined in the standard library][5]: ```rust enum Option<T> { |