Skip to content

Commit 1fe126a

Browse files
committed
Auto merge of #28420 - christopherdumas:intergrate_error_burnstushi, r=steveklabnik
This was pointed out by @filsmick and @swatteau in #28412.
2 parents 0f1f5fc + e66a1dc commit 1fe126a

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

src/doc/trpl/error-handling.md

+5-6
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ systems may want to jump around.
2424
* [The Basics](#the-basics)
2525
* [Unwrapping explained](#unwrapping-explained)
2626
* [The `Option` type](#the-option-type)
27-
* [Composing `Option<T>` values](#composing-optiont-values)
27+
* [Composing `Option<T>` values](#composing-option<t>-values)
2828
* [The `Result` type](#the-result-type)
2929
* [Parsing integers](#parsing-integers)
3030
* [The `Result` type alias idiom](#the-result-type-alias-idiom)
@@ -33,19 +33,19 @@ systems may want to jump around.
3333
* [Composing `Option` and `Result`](#composing-option-and-result)
3434
* [The limits of combinators](#the-limits-of-combinators)
3535
* [Early returns](#early-returns)
36-
* [The `try!` macro](#the-try-macro)
36+
* [The `try!` macro](#the-try!-macro)
3737
* [Defining your own error type](#defining-your-own-error-type)
3838
* [Standard library traits used for error handling](#standard-library-traits-used-for-error-handling)
3939
* [The `Error` trait](#the-error-trait)
4040
* [The `From` trait](#the-from-trait)
41-
* [The real `try!` macro](#the-real-try-macro)
41+
* [The real `try!` macro](#the-real-try!-macro)
4242
* [Composing custom error types](#composing-custom-error-types)
4343
* [Advice for library writers](#advice-for-library-writers)
4444
* [Case study: A program to read population data](#case-study-a-program-to-read-population-data)
4545
* [Initial setup](#initial-setup)
4646
* [Argument parsing](#argument-parsing)
4747
* [Writing the logic](#writing-the-logic)
48-
* [Error handling with `Box<Error>`](#error-handling-with-boxerror)
48+
* [Error handling with `Box<Error>`](#error-handling-with-box<error>)
4949
* [Reading from stdin](#reading-from-stdin)
5050
* [Error handling with a custom type](#error-handling-with-a-custom-type)
5151
* [Adding functionality](#adding-functionality)
@@ -122,8 +122,7 @@ types. Both of these types have a method called `unwrap` defined on them.
122122

123123
## The `Option` type
124124

125-
The `Option` type is
126-
[defined in the standard library][1]:
125+
The `Option` type is [defined in the standard library][5]:
127126

128127
```rust
129128
enum Option<T> {

0 commit comments

Comments
 (0)