---

yaml
---
r: 15594
b: refs/heads/try
c: 734166f
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 43061f3969d1d961bd4e4d57c06452ca80c1adb6
+refs/heads/try: 734166f41c3c5ba48498df0133383a451e7fdb3e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rustc/middle/tstate/ck.rs

@@ -7,7 +7,8 @@ import middle::ty;
 import tstate::ann::{precond, prestate,
                      implies, ann_precond, ann_prestate};
 import aux::*;
-import syntax::print::pprust::ty_to_str;
+
+import util::ppaux::ty_to_str;
 import bitvectors::*;
 import annotate::annotate_crate;
 import collect_locals::mk_f_to_fn_info;
@@ -116,13 +117,14 @@ fn check_states_against_conditions(fcx: fn_ctxt,
        !ty::type_is_nil(ty::ty_fn_ret(ty::node_id_to_type(
            fcx.ccx.tcx, id))) &&
        f_decl.cf == return_val {
+        let fn_ty = ty::node_id_to_type(fcx.ccx.tcx, id);
         fcx.ccx.tcx.sess.span_err(f_body.span,
-                                  "in function " + fcx.name +
-                                      ", not all control paths \
-                                        return a value");
+                    #fmt("in function `%s`, not all control paths \
+                          return a value", fcx.name));
         fcx.ccx.tcx.sess.span_fatal(f_decl.output.span,
-                                    "see declared return type of '" +
-                                    ty_to_str(f_decl.output) + "'");
+                                    #fmt("see function return type of `%s`",
+                                         ty_to_str(fcx.ccx.tcx,
+                                           ty::ty_fn_ret(fn_ty))));
     } else if f_decl.cf == noreturn {
 
         // check that this really always fails

branches/try/src/test/compile-fail/issue-2163.rs

@@ -0,0 +1,5 @@
+fn main(s: [str]) {
+    let a = [];
+    vec::each(a) { |x| //! ERROR in function `anon`, not all control paths
+    }                  //! ERROR see function return type of `bool`
+}