diff options
| author | bors <bors@rust-lang.org> | 2013-06-07 08:55:33 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-06-07 08:55:33 -0700 |
| commit | 18019a1304c5cf6ec6f04e43b030602c8fec0e01 (patch) | |
| tree | aff940fe74a5660cb0bd1abbc3b6b4cafa05f0d1 | |
| parent | 0d0c004b819f829f7401e74c339a7bbe596e0bdf (diff) | |
| parent | bc81d279fa04de7c956871ff6668d2a3d5e6d78c (diff) | |
| download | rust-18019a1304c5cf6ec6f04e43b030602c8fec0e01.tar.gz rust-18019a1304c5cf6ec6f04e43b030602c8fec0e01.zip | |
auto merge of #6990 : huonw/rust/const-eval, r=bstrie
This fail! caused ICEs, but was trivial to convert to a useful error message.
| -rw-r--r-- | src/librustc/middle/const_eval.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc/middle/const_eval.rs b/src/librustc/middle/const_eval.rs index 7e8e5bffb57..0327a8e81c7 100644 --- a/src/librustc/middle/const_eval.rs +++ b/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) } } |