From 15f2eee421a1232f6c40664c6f964c555c015c42 Mon Sep 17 00:00:00 2001
From: Sam Sartor <me@samsartor.com>
Date: Fri, 27 Jul 2018 16:34:12 -0600
Subject: [PATCH] reference examples: add box, nll fixes, and typos

---
 text/0000-capture-disjoint-fields.md | 39 ++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/text/0000-capture-disjoint-fields.md b/text/0000-capture-disjoint-fields.md
index 941efd79ccb..318ba4c8789 100644
--- a/text/0000-capture-disjoint-fields.md
+++ b/text/0000-capture-disjoint-fields.md
@@ -169,18 +169,20 @@ let foo = 10;
 - `&mut foo` (not a struct)
 
 ```rust
-let _a = &mut foo.a;
+let a = &mut foo.a;
 || (&mut foo.b, &mut foo.c);
+somefunc(a);
 ```
 
 - `&mut foo.b` (used in entirety)
-- `&mut foo.a` (used in entirety)
+- `&mut foo.c` (used in entirety)
 
 The borrow checker passes because `foo.a`, `foo.b`, and `foo.c` are disjoint.
 
 ```rust
-let _a = &mut foo.a;
+let a = &mut foo.a;
 move || foo.b;
+somefunc(a);
 ```
 
 - `foo.b` (used in entirety)
@@ -188,11 +190,12 @@ move || foo.b;
 The borrow checker passes because `foo.a` and `foo.b` are disjoint.
 
 ```rust
-let _hello = &foo.hello;
+let hello = &foo.hello;
 move || foo.drop_world.a;
+somefunc(hello);
 ```
 
-- `foo.drop_world` (owned & implements drop)
+- `foo.drop_world` (owned and implements drop)
 
 The borrow checker passes because `foo.hello` and `foo.drop_world` are disjoint.
 
@@ -216,13 +219,14 @@ let bar = (1, 2); // struct
 - `bar` (used in entirety)
 
 ```rust
-let _foo_again = &mut foo;
+let foo_again = &mut foo;
 || &mut foo.a;
+somefunc(foo_again);
 ```
 
 - `&mut foo.a`  (used in entirety)
 
-The borrow checker fails because `_foo_again` and `foo.a` intersect.
+The borrow checker fails because `foo_again` and `foo.a` intersect.
 
 ```rust
 let _a = foo.a;
@@ -234,14 +238,27 @@ let _a = foo.a;
 The borrow checker fails because `foo.a` has already been moved.
 
 ```rust
-let _a = drop_foo.a;
+let a = &drop_foo.a;
 move || drop_foo.b;
+somefunc(a);
+```
+
+- `drop_foo` (owned and implements drop)
+
+The borrow checker fails because `drop_foo` can not be moved while borrowed.
+
+```rust
+|| &box_foo.a;
 ```
 
-- `drop_foo` (owned & implements drop)
+- `&<Box<_> as Deref>::deref(&box_foo).b` (pure function call)
+
+```rust
+move || &box_foo.a;
+```
 
-The borrow checker fails because `drop_foo` can not be destructured + use of
-partially moved value.
+- `box_foo` (`move` forces full capure of `box_foo`, since it can not be
+  destructured)
 
 # Drawbacks
 [drawbacks]: #drawbacks