rustc: Rename session.span_err -> span_fatal, err -> fatal

Issue #440

2 files changed, 10 insertions, 9 deletions

diff --git a/src/comp/middle/tstate/auxiliary.rs b/src/comp/middle/tstate/auxiliary.rs
index e7013752ded..efd69f137c6 100644
--- a/src/comp/middle/tstate/auxiliary.rs
+++ b/src/comp/middle/tstate/auxiliary.rs
@@ -560,7 +560,7 @@ fn expr_to_constr_arg(ty::ctxt tcx, &@expr e) -> @constr_arg_use {
         }
         case (expr_lit(?l, _)) { ret @respan(e.span, carg_lit(l)); }
         case (_) {
-            tcx.sess.span_err(e.span,
+            tcx.sess.span_fatal(e.span,
                               "Arguments to constrained functions must be "
                               + "literals or local variables");
         }
@@ -587,7 +587,7 @@ fn expr_to_constr(ty::ctxt tcx, &@expr e) -> constr {
                                            exprs_to_constr_args(tcx, args))));
                 }
                 case (_) {
-                    tcx.sess.span_err(operator.span,
+                    tcx.sess.span_fatal(operator.span,
                                       "Internal error: " +
                                           " ill-formed operator \
                                             in predicate");
@@ -595,7 +595,7 @@ fn expr_to_constr(ty::ctxt tcx, &@expr e) -> constr {
             }
         }
         case (_) {
-            tcx.sess.span_err(e.span,
+            tcx.sess.span_fatal(e.span,
                               "Internal error: " + " ill-formed predicate");
         }
     }
@@ -626,7 +626,8 @@ fn substitute_arg(&ty::ctxt cx, &vec[@expr] actuals, @ast::constr_arg a) ->
             if (i < num_actuals) {
                 ret expr_to_constr_arg(cx, actuals.(i));
             } else {
-                cx.sess.span_err(a.span, "Constraint argument out of bounds");
+                cx.sess.span_fatal(a.span,
+                                   "Constraint argument out of bounds");
             }
         }
         case (carg_base) { ret @respan(a.span, carg_base); }
@@ -636,7 +637,7 @@ fn substitute_arg(&ty::ctxt cx, &vec[@expr] actuals, @ast::constr_arg a) ->
 
 fn path_to_ident(&ty::ctxt cx, &path p) -> ident {
     alt (vec::last(p.node.idents)) {
-        case (none) { cx.sess.span_err(p.span, "Malformed path"); }
+        case (none) { cx.sess.span_fatal(p.span, "Malformed path"); }
         case (some(?i)) { ret i; }
     }
 }
diff --git a/src/comp/middle/tstate/ck.rs b/src/comp/middle/tstate/ck.rs
index ce170fb1db9..7098d070660 100644
--- a/src/comp/middle/tstate/ck.rs
+++ b/src/comp/middle/tstate/ck.rs
@@ -85,7 +85,7 @@ fn check_states_expr(&fn_ctxt fcx, &@expr e) {
         s += bitv_to_str(fcx, prec);
         s += "\nPrestate:\n";
         s += bitv_to_str(fcx, pres);
-        fcx.ccx.tcx.sess.span_err(e.span, s);
+        fcx.ccx.tcx.sess.span_fatal(e.span, s);
     }
 }
 
@@ -114,7 +114,7 @@ fn check_states_stmt(&fn_ctxt fcx, &@stmt s) {
         ss += bitv_to_str(fcx, prec);
         ss += "\nPrestate: \n";
         ss += bitv_to_str(fcx, pres);
-        fcx.ccx.tcx.sess.span_err(s.span, ss);
+        fcx.ccx.tcx.sess.span_fatal(s.span, ss);
     }
 }
 
@@ -153,7 +153,7 @@ fn check_states_against_conditions(&fn_ctxt fcx, &_fn f, &ann a,
                                    "In function " + fcx.name +
                                        ", not all control paths \
                                         return a value");
-        fcx.ccx.tcx.sess.span_err(f.decl.output.span,
+        fcx.ccx.tcx.sess.span_fatal(f.decl.output.span,
                                   "see declared return type of '" +
                                       ty_to_str(*f.decl.output) + "'");
     } else if (f.decl.cf == noreturn) {
@@ -162,7 +162,7 @@ fn check_states_against_conditions(&fn_ctxt fcx, &_fn f, &ann a,
         // the fcx.id bit means "returns" for a returning fn,
         // "diverges" for a non-returning fn
         if (!promises(fcx, post, ret_c)) {
-            fcx.ccx.tcx.sess.span_err(f.body.span,
+            fcx.ccx.tcx.sess.span_fatal(f.body.span,
                                       "In non-returning function " + fcx.name
                                           +
                                           ", some control paths may \