about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-09-21 00:58:03 +0000
committerbors <bors@rust-lang.org>2015-09-21 00:58:03 +0000
commit0418a43fa3ce430d18e87c66afb2185395f354d6 (patch)
treeea01f085d730f7ea4c9085cda2ccf095eb53a53a
parentb7f49ca0fa859fa82080736aff4a8d3832776b04 (diff)
parent856f97a15e581357b31c76bf2be749ca71a93631 (diff)
downloadrust-0418a43fa3ce430d18e87c66afb2185395f354d6.tar.gz
rust-0418a43fa3ce430d18e87c66afb2185395f354d6.zip
Auto merge of #28541 - baskerville:trpl-two-typos, r=steveklabnik
r? @steveklabnik
-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 47d41a155e4..555d97ec3c3 100644
--- a/src/doc/trpl/error-handling.md
+++ b/src/doc/trpl/error-handling.md
@@ -154,7 +154,7 @@ fn find(haystack: &str, needle: char) -> Option<usize> {
 }
 ```
 
-Notice that when this function finds a matching character, it doen't just
+Notice that when this function finds a matching character, it doesn't just
 return the `offset`. Instead, it returns `Some(offset)`. `Some` is a variant or
 a *value constructor* for the `Option` type. You can think of it as a function
 with the type `fn<T>(value: T) -> Option<T>`. Correspondingly, `None` is also a
@@ -840,7 +840,7 @@ example, the very last call to `map` multiplies the `Ok(...)` value (which is
 an `i32`) by `2`. If an error had occurred before that point, this operation
 would have been skipped because of how `map` is defined.
 
-`map_err` is the trick the makes all of this work. `map_err` is just like
+`map_err` is the trick that makes all of this work. `map_err` is just like
 `map`, except it applies a function to the `Err(...)` value of a `Result`. In
 this case, we want to convert all of our errors to one type: `String`. Since
 both `io::Error` and `num::ParseIntError` implement `ToString`, we can call the