Skip to content

Commit 098b397

Browse files
committed
---
yaml --- r: 5324 b: refs/heads/master c: 059952d h: refs/heads/master v: v3
1 parent de2dfa6 commit 098b397

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

[refs]

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 994beca00d21af69a6ae70a3aae2e829a65fdaff
2+
refs/heads/master: 059952da5b18e475b6018c1d58e3b5099c57fdba

trunk/src/comp/middle/typeck.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -2494,7 +2494,7 @@ fn check_pred_expr(fcx: @fn_ctxt, e: @ast::expr) -> bool {
24942494
alt e.node {
24952495
ast::expr_call(operator, operands) {
24962496
if !ty::is_pred_ty(fcx.ccx.tcx, expr_ty(fcx.ccx.tcx, operator)) {
2497-
fcx.ccx.tcx.sess.span_fatal
2497+
fcx.ccx.tcx.sess.span_err
24982498
(operator.span,
24992499
"operator in constraint has non-boolean return type");
25002500
}
@@ -2506,7 +2506,7 @@ fn check_pred_expr(fcx: @fn_ctxt, e: @ast::expr) -> bool {
25062506
// do nothing
25072507
}
25082508
_ {
2509-
fcx.ccx.tcx.sess.span_fatal(operator.span,
2509+
fcx.ccx.tcx.sess.span_err(operator.span,
25102510
"Impure function as operator \
25112511
in constraint");
25122512
}
@@ -2516,19 +2516,19 @@ in constraint");
25162516
let s =
25172517
"Constraint args must be \
25182518
slot variables or literals";
2519-
fcx.ccx.tcx.sess.span_fatal(e.span, s);
2519+
fcx.ccx.tcx.sess.span_err(e.span, s);
25202520
}
25212521
}
25222522
}
25232523
_ {
25242524
let s =
25252525
"In a constraint, expected the \
25262526
constraint name to be an explicit name";
2527-
fcx.ccx.tcx.sess.span_fatal(e.span, s);
2527+
fcx.ccx.tcx.sess.span_err(e.span, s);
25282528
}
25292529
}
25302530
}
2531-
_ { fcx.ccx.tcx.sess.span_fatal(e.span, "check on non-predicate"); }
2531+
_ { fcx.ccx.tcx.sess.span_err(e.span, "check on non-predicate"); }
25322532
}
25332533
ret bot;
25342534
}

0 commit comments

Comments
 (0)