---

yaml
---
r: 2687
b: refs/heads/master
c: 964898e
h: refs/heads/master
i:
  2685: b0a0564
  2683: ecff9a3
  2679: d881ef0
  2671: 1265200
  2655: c13f008
  2623: 766a3c9
  2559: 5deb7d9
v: v3

Author: catamorphism

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fed0486c336c14e18eb341db8aa9de023320a603
+refs/heads/master: 964898eaf19d25e6786f373cf1c6f423e3f767fc

trunk/src/comp/middle/tstate/ck.rs

@@ -129,11 +129,9 @@ fn check_states_against_conditions(&fn_ctxt fcx, &_fn f, &ann a) -> () {
         && ! promises(*post, fcx.id, enclosing)
         && ! type_is_nil(fcx.ccx.tcx,
                          ret_ty_of_fn(fcx.ccx.tcx, a)) ) {
-        /* FIXME: call span_err, not span_warn, once I finish implementing
-           ! annotations */
-        fcx.ccx.tcx.sess.span_warn(f.body.span, "In function " + fcx.name +
+        fcx.ccx.tcx.sess.span_note(f.body.span, "In function " + fcx.name +
           ", not all control paths return a value");
-        fcx.ccx.tcx.sess.span_note(f.decl.output.span,
+        fcx.ccx.tcx.sess.span_err(f.decl.output.span,
             "see declared return type of '" + ty_to_str(*f.decl.output) +
             "'");
     }