about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorTim Chevalier <chevalier@alum.wellesley.edu>2013-01-07 18:27:20 -0800
committerTim Chevalier <chevalier@alum.wellesley.edu>2013-01-07 18:27:20 -0800
commit4557f70487e10c1f4e304f4bb853dbab444359dc (patch)
tree9e51996ee9aca530df2ea98b3c75864b3f969e44 /src
parent7b433d098a4a6b9959976633a77041923cef38c3 (diff)
downloadrust-4557f70487e10c1f4e304f4bb853dbab444359dc.tar.gz
rust-4557f70487e10c1f4e304f4bb853dbab444359dc.zip
Revert "Suppress type error message involving a function type whose result is ty_err"
This reverts commit e45312e5a0557b2d79028bd5f869f979bc2b5924.
Diffstat (limited to 'src')
-rw-r--r--src/librustc/middle/typeck/infer/mod.rs8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/librustc/middle/typeck/infer/mod.rs b/src/librustc/middle/typeck/infer/mod.rs
index 801b0966f75..279318079b9 100644
--- a/src/librustc/middle/typeck/infer/mod.rs
+++ b/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|