---

yaml
---
r: 227752
b: refs/heads/try
c: ce0c257
h: refs/heads/master
v: v3

Author: nrc

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: aca2057ed5fb7af3f8905b2bc01f72fa001c35c8
 refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
-refs/heads/try: 17450192d93542b981df1f046007ed781ecd0ec0
+refs/heads/try: ce0c2572ec2bf89c6fb5ded2ce18d593abf73b22
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/doc/trpl/error-handling.md

@@ -225,9 +225,9 @@ There's another way of doing this that's a bit nicer than `unwrap()`:
 
 ```rust,ignore
 let mut buffer = String::new();
-let num_bytes_read = io::stdin().read_line(&mut buffer)
-                                .ok()
-                                .expect("Failed to read line");
+let input = io::stdin().read_line(&mut buffer)
+                       .ok()
+                       .expect("Failed to read line");
 ```
 
 `ok()` converts the `Result` into an `Option`, and `expect()` does the same

branches/try/src/librustc/middle/ty.rs

@@ -3283,6 +3283,7 @@ impl FlagComputation {
             }
 
             &TyClosure(_, substs) => {
+                self.add_flags(TypeFlags::HAS_TY_CLOSURE);
                 self.add_flags(TypeFlags::HAS_LOCAL_NAMES);
                 self.add_substs(substs);
             }