about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2015-09-30 14:51:54 -0400
committerSteve Klabnik <steve@steveklabnik.com>2015-09-30 14:51:54 -0400
commit37d291e6ff06630a8b34d64696eecd2a95dbe1c3 (patch)
tree14f8fd3050e5358f4c86182fe4b0634685e8447d
parent27254bc4aac388875dfabac28cd717b1525f84c2 (diff)
parent9c70d5160bbd76ed428499d8a54b7a47361b2007 (diff)
downloadrust-37d291e6ff06630a8b34d64696eecd2a95dbe1c3.tar.gz
rust-37d291e6ff06630a8b34d64696eecd2a95dbe1c3.zip
Rollup merge of #28755 - steveklabnik:gh28418, r=alexcrichton
The original blog post referred to examples by their file names, and now
that it's in guide form, there is no file name. So edit the text so that
it makes a bit more sense.

Fixes #28428
-rw-r--r--src/doc/trpl/error-handling.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/doc/trpl/error-handling.md b/src/doc/trpl/error-handling.md
index a54ba91da2e..7fb1a79dcf1 100644
--- a/src/doc/trpl/error-handling.md
+++ b/src/doc/trpl/error-handling.md
@@ -182,7 +182,7 @@ analysis is the only way to get at the value stored inside an `Option<T>`. This
 means that you, as the programmer, must handle the case when an `Option<T>` is
 `None` instead of `Some(t)`.
 
-But wait, what about `unwrap` used in [`unwrap-double`](#code-unwrap-double)?
+But wait, what about `unwrap`,which we used [`previously`](#code-unwrap-double)?
 There was no case analysis there! Instead, the case analysis was put inside the
 `unwrap` method for you. You could define it yourself if you want:
 
@@ -211,7 +211,7 @@ that makes `unwrap` ergonomic to use. Unfortunately, that `panic!` means that
 
 ### Composing `Option<T>` values
 
-In [`option-ex-string-find`](#code-option-ex-string-find)
+In an [example from before](#code-option-ex-string-find),
 we saw how to use `find` to discover the extension in a file name. Of course,
 not all file names have a `.` in them, so it's possible that the file name has
 no extension. This *possibility of absence* is encoded into the types using