---

yaml
---
r: 69099
b: refs/heads/auto
c: 6aa43c7
h: refs/heads/master
i:
  69097: cc59f23
  69095: bdb2573
v: v3

Author: michaelwoerister

[refs]

@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: d8c27c3446582a318b35103e6ec3594c53f196b1
+refs/heads/auto: 6aa43c77d4eaf72e673f060ed07bce7f8fc5757d
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/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");