---

yaml
---
r: 178572
b: refs/heads/try
c: e778ea4
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 336c8d2e9c6b276b162bdb3edd43706372e6eddd
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 474b324eda10440d6568ef872a7307d38e7de95b
-refs/heads/try: 5a39a0d266705d594ff31b8e386bc8c1e54ab019
+refs/heads/try: e778ea40701751ca15b19a8983949573ea9e3a07
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/src/librustc_typeck/check/closure.rs

@@ -42,7 +42,8 @@ pub fn check_expr_closure<'a,'tcx>(fcx: &FnCtxt<'a,'tcx>,
             // If users didn't specify what sort of closure they want,
             // examine the expected type. For now, if we see explicit
             // evidence than an unboxed closure is desired, we'll use
-            // that, otherwise we'll error, requesting an annotation.
+            // that. Otherwise, we leave it unspecified, to be filled
+            // in by upvar inference.
             match expected_sig_and_kind {
                 None => { // don't have information about the kind, request explicit annotation
                     check_closure(fcx, expr, None, decl, body, None);

branches/try/src/librustc_typeck/check/mod.rs

@@ -177,7 +177,7 @@ pub struct Inherited<'a, 'tcx: 'a> {
     // we may not have decided yet whether `c` is a `Fn`, `FnMut`, or
     // `FnOnce` closure. In that case, we defer full resolution of the
     // call until upvar inference can kick in and make the
-    // decision. We keep these deferred resolutions sorted by the
+    // decision. We keep these deferred resolutions grouped by the
     // def-id of the closure, so that once we decide, we can easily go
     // back and process them.
     deferred_call_resolutions: RefCell<DefIdMap<Vec<DeferredCallResolutionHandler<'tcx>>>>,