---

yaml
---
r: 277054
b: refs/heads/try
c: de82fc4
h: refs/heads/master

Author: soltanmm-google

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 6dbb0e86aec11050480beb76eade6fb805010ba7
 refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
-refs/heads/try: e45c7955e94fe55b7ca83dfb76b1bb50dfea74f6
+refs/heads/try: de82fc4dc6bbb87e50618f40e8fc671fb016f815
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/librustc/diagnostics.rs

@@ -1544,5 +1544,5 @@ register_diagnostics! {
     E0490, // a value of type `..` is borrowed for too long
     E0491, // in type `..`, reference has a longer lifetime than the data it...
     E0495, // cannot infer an appropriate lifetime due to conflicting requirements
-    E0524, // the closure implements `..` but not `..`
+    E0524, // expected a closure that implements `..` but this closure only implements `..`
 }

branches/try/src/librustc/traits/error_reporting.rs

@@ -471,9 +471,10 @@ pub fn report_selection_error<'a, 'tcx>(infcx: &InferCtxt<'a, 'tcx>,
                         let closure_span = infcx.tcx.map.span_if_local(closure_def_id).unwrap();
                         let mut err = struct_span_err!(
                             infcx.tcx.sess, closure_span, E0524,
-                            "the closure implements `{}` but not `{}`",
-                            found_kind,
-                            kind);
+                            "expected a closure that implements the `{}` trait, but this closure \
+                             only implements `{}`",
+                            kind,
+                            found_kind);
                         err.span_note(
                             obligation.cause.span,
                             &format!("the requirement to implement `{}` derives from here", kind));

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

@@ -179,9 +179,16 @@ fn deduce_expectations_from_obligations<'a,'tcx>(
                 ty::Predicate::TypeOutlives(..) => None,
                 ty::Predicate::WellFormed(..) => None,
                 ty::Predicate::ObjectSafe(..) => None,
-                ty::Predicate::ClosureKind(_closure_def_id, kind) => {
-                    return Some(kind);
-                }
+
+                // NB: This predicate is created by breaking down a
+                // `ClosureType: FnFoo()` predicate, where
+                // `ClosureType` represents some `TyClosure`. It can't
+                // possibly be referring to the current closure,
+                // because we haven't produced the `TyClosure` for
+                // this closure yet; this is exactly why the other
+                // code is looking for a self type of a unresolved
+                // inference variable.
+                ty::Predicate::ClosureKind(..) => None,
             };
             opt_trait_ref
                 .and_then(|trait_ref| self_type_matches_expected_vid(fcx, trait_ref, expected_vid))

branches/try/src/test/compile-fail/closure-wrong-kind.rs

@@ -17,7 +17,6 @@ fn bar<T: Fn(u32)>(_: T) {}
 
 fn main() {
     let x = X;
-    let closure = |_| foo(x);
-    //~^ ERROR the closure implements `FnOnce` but not `Fn`
+    let closure = |_| foo(x);  //~ ERROR E0524
     bar(closure);
 }