---

yaml
---
r: 52149
b: refs/heads/dist-snap
c: 4557f70
h: refs/heads/master
i:
  52147: dd128a2
v: v3

Author: catamorphism

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
-refs/heads/dist-snap: 7b433d098a4a6b9959976633a77041923cef38c3
+refs/heads/dist-snap: 4557f70487e10c1f4e304f4bb853dbab444359dc
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/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|