---

yaml
---
r: 56694
b: refs/heads/try
c: 13801f6
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: c081ffbd1e845687202a975ea2e698b623e5722f
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 79a2b2eafc3c766cecec8a5f76317693bae9ed17
-refs/heads/try: d7163985b8c8daccc34cc6213fb621657f1bc50a
+refs/heads/try: 13801f60b26009991cd6880b6b40fae9265a8280
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/librustc/middle/typeck/check/mod.rs

@@ -1135,22 +1135,23 @@ pub fn check_expr_with_unifier(fcx: @mut FnCtxt,
         sugar: ast::CallSugar,
         deref_args: DerefArgs) -> ty::t
     {
-        match ty::get(method_fn_ty).sty {
-            ty::ty_bare_fn(ref fty) => {
-                check_argument_types(fcx, sp, fty.sig.inputs, callee_expr,
-                                     args, sugar, deref_args);
-                fty.sig.output
-            }
-            ty::ty_err => {
-                let err_inputs = err_args(fcx.tcx(), args.len());
-                check_argument_types(fcx, sp, err_inputs, callee_expr,
-                                     args, sugar, deref_args);
-                method_fn_ty
-            }
-            _ => {
-                fcx.tcx().sess.span_bug(
-                    sp,
-                    fmt!("Method without bare fn type"));
+        if ty::type_is_error(method_fn_ty) {
+            let err_inputs = err_args(fcx.tcx(), args.len());
+            check_argument_types(fcx, sp, err_inputs, callee_expr,
+                                 args, sugar, deref_args);
+            method_fn_ty
+        } else {
+            match ty::get(method_fn_ty).sty {
+                ty::ty_bare_fn(ref fty) => {
+                    check_argument_types(fcx, sp, fty.sig.inputs, callee_expr,
+                                         args, sugar, deref_args);
+                    fty.sig.output
+                }
+                _ => {
+                    fcx.tcx().sess.span_bug(
+                        sp,
+                        fmt!("Method without bare fn type"));
+                }
             }
         }
     }