---

yaml
---
r: 262143
b: refs/heads/snap-stage3
c: 5f20143
h: refs/heads/master
i:
  262141: b148741
  262139: e526dd9
  262135: a52374e
  262127: ebafa31
  262111: 6423202
  262079: 35ab85a
  262015: 08efe02
  261887: 57ba2d8
  261631: 335db1c
  261119: e72a428
  260095: 1f26b4a
  258047: a2e9a59
  253951: 94e831b
  245759: 142ab2f
  229375: 1543e46
  196607: 8d8c63c
  131071: 126dbf5

Author: sandeep-datta

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 5a0308abadce38396f27122d5c8639ffb2a21469
-refs/heads/snap-stage3: 25d068e36ed2f4c1b526185fbb2763c38616a10f
+refs/heads/snap-stage3: 5f20143ccfd1a74a8a104ecac33f777ade12992f
 refs/heads/try: 29d24a3b02cb805da19450bf9830a8f0a6bd859c
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/snap-stage3/src/doc/book/error-handling.md

@@ -359,11 +359,18 @@ fn file_path_ext(file_path: &str) -> Option<&str> {
 }
 ```
 
-The `map` function here wraps the value returned by the `extension` function inside an `Option<_>` and since the `extension` function itself returns an `Option<&str>` the expression `file_name(file_path).map(|x| extension(x))` actually returns an `Option<Option<&str>>`.
+The `map` function here wraps the value returned by the `extension` function
+inside an `Option<_>` and since the `extension` function itself returns an
+`Option<&str>` the expression `file_name(file_path).map(|x| extension(x))`
+actually returns an `Option<Option<&str>>`.
 
-But since `file_path_ext` just returns `Option<&str>` (and not `Option<Option<&str>>`) we get a compilation error.
+But since `file_path_ext` just returns `Option<&str>` (and not
+`Option<Option<&str>>`) we get a compilation error.
 
-The result of the function taken by map as input is *always* [rewrapped with `Some`](#code-option-map). Instead, we need something like `map`, but which allows the caller to return a `Option<_>` directly without wrapping it in another `Option<_>`.
+The result of the function taken by map as input is *always* [rewrapped with
+`Some`](#code-option-map). Instead, we need something like `map`, but which
+allows the caller to return a `Option<_>` directly without wrapping it in
+another `Option<_>`.
 
 Its generic implementation is even simpler than `map`:
 
@@ -387,7 +394,9 @@ fn file_path_ext(file_path: &str) -> Option<&str> {
 }
 ```
 
-Side note: Since `and_then` essentially works like `map` but returns an `Option<_>` instead of an `Option<Option<_>>` it is known as `flatmap` in some other languages.
+Side note: Since `and_then` essentially works like `map` but returns an
+`Option<_>` instead of an `Option<Option<_>>` it is known as `flatmap` in some
+other languages.
 
 The `Option` type has many other combinators [defined in the standard
 library][5]. It is a good idea to skim this list and familiarize