---

yaml
---
r: 37039
b: refs/heads/try2
c: e45312e
h: refs/heads/master
i:
  37037: d0ebaeb
  37035: 0719758
  37031: 28a8f0b
  37023: d07be29
v: v3

Author: catamorphism

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: c662a9aad7a158c797faa4bd805808f867a3e22e
+refs/heads/try2: e45312e5a0557b2d79028bd5f869f979bc2b5924
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/librustc/middle/typeck/infer/mod.rs

@@ -741,6 +741,14 @@ impl infer_ctxt {
         // Don't report an error if actual type is ty_err.
         match ty::get(actual_ty).sty {
             ty::ty_err => return,
+            // Should really not report an error if the type
+            // has ty_err anywhere as a component, but that's
+            // annoying since we haven't written a visitor for
+            // ty::t yet
+            ty::ty_fn(fty) => match ty::get(fty.sig.output).sty {
+                ty::ty_err => return,
+                _ => ()
+            },
             _           => ()
         }
         let error_str = err.map_default(~"", |t_err|