about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Woerister <michaelwoerister@gmail>2013-07-17 18:46:53 +0200
committerMichael Woerister <michaelwoerister@gmail>2013-07-19 07:58:28 +0200
commit6aa43c77d4eaf72e673f060ed07bce7f8fc5757d (patch)
treedf5e0ed488df8b26b7b8e2279bceb7d9df06b4fa
parentd8c27c3446582a318b35103e6ec3594c53f196b1 (diff)
downloadrust-6aa43c77d4eaf72e673f060ed07bce7f8fc5757d.tar.gz
rust-6aa43c77d4eaf72e673f060ed07bce7f8fc5757d.zip
debuginfo: Fixed some merge fallout.
-rw-r--r--src/librustc/middle/ty.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc/middle/ty.rs b/src/librustc/middle/ty.rs
index 6c1d8b966e5..662a64ea788 100644
--- a/src/librustc/middle/ty.rs
+++ b/src/librustc/middle/ty.rs
@@ -3914,7 +3914,7 @@ pub fn enum_variants(cx: ctxt, id: ast::def_id) -> @~[@VariantInfo] {
                 };
 
                 match variant.node.disr_expr {
-                    Some(e) => match const_eval::eval_const_expr_partial(cx, e) {
+                    Some(e) => match const_eval::eval_const_expr_partial(&cx, e) {
                         Ok(const_eval::const_int(val)) => discriminant = val as int,
                         Ok(_) => {
                             cx.sess.span_err(e.span, "expected signed integer constant");