---

thestinger · thestinger · commit c0a040b1d85b · 2013-06-07T14:43:02.000-04:00
yaml --- r: 63088 b: refs/heads/snap-stage3 c: d945543 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 54d914a9a932a0e9e65195f0f5be91e5e8b7f342
+refs/heads/snap-stage3: d945543ebf446913a44375169aa23686ffaa6205
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
diff --git a/branches/snap-stage3/src/librustc/middle/const_eval.rs b/branches/snap-stage3/src/librustc/middle/const_eval.rs
@@ -242,7 +242,7 @@ pub enum const_val {
 pub fn eval_const_expr(tcx: middle::ty::ctxt, e: @expr) -> const_val {
     match eval_const_expr_partial(tcx, e) {
         Ok(ref r) => (/*bad*/copy *r),
-        Err(ref s) => fail!(/*bad*/copy *s)
+        Err(ref s) => tcx.sess.span_fatal(e.span, *s)
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ pub enum const_val {`
`242`	`242`	`pub fn eval_const_expr(tcx: middle::ty::ctxt, e: @expr) -> const_val {`
`243`	`243`	`match eval_const_expr_partial(tcx, e) {`
`244`	`244`	`Ok(ref r) => (/bad/copy *r),`
`245`		`- Err(ref s) => fail!(/bad/copy *s)`
	`245`	`+ Err(ref s) => tcx.sess.span_fatal(e.span, *s)`
`246`	`246`	`}`
`247`	`247`	`}`
`248`	`248`