---

yaml
---
r: 41601
b: refs/heads/master
c: 4557f70
h: refs/heads/master
i:
  41599: 909fc23
v: v3

Author: catamorphism

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 7b433d098a4a6b9959976633a77041923cef38c3
+refs/heads/master: 4557f70487e10c1f4e304f4bb853dbab444359dc
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
 refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650

trunk/src/librustc/middle/typeck/infer/mod.rs

@@ -741,14 +741,6 @@ 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|