---

yaml
---
r: 54775
b: refs/heads/snap-stage3
c: c2f5a87
h: refs/heads/master
i:
  54773: 4e006b0
  54771: cfb22af
  54767: 87b2e74
v: v3

Author: bors

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 5f13e9ccc2e3328d4cd8ca49f84e6840dd998346
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: c6f7b595f0bb3d8388a6bb89afc457a4702ec374
+refs/heads/snap-stage3: c2f5a87cdd79e5531b751749827d2e8a3d269c9e
 refs/heads/try: 8eb2bab100b42f0ba751552d8eff00eb2134c55a
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/const_eval.rs

@@ -371,32 +371,31 @@ pub fn eval_const_expr_partial(tcx: middle::ty::ctxt, e: @expr)
       expr_cast(base, _) => {
         let ety = ty::expr_ty(tcx, e);
         let base = eval_const_expr_partial(tcx, base);
-        match ty::get(ety).sty {
-          ty::ty_float(_) => {
-            match base {
-              Ok(const_uint(u)) => Ok(const_float(u as f64)),
-              Ok(const_int(i)) => Ok(const_float(i as f64)),
-              Ok(const_float(_)) => base,
-              _ => Err(~"Can't cast float to str")
-            }
-          }
-          ty::ty_uint(_) => {
-            match base {
-              Ok(const_uint(_)) => base,
-              Ok(const_int(i)) => Ok(const_uint(i as u64)),
-              Ok(const_float(f)) => Ok(const_uint(f as u64)),
-              _ => Err(~"Can't cast str to uint")
-            }
-          }
-          ty::ty_int(_) | ty::ty_bool => {
-            match base {
-              Ok(const_uint(u)) => Ok(const_int(u as i64)),
-              Ok(const_int(_)) => base,
-              Ok(const_float(f)) => Ok(const_int(f as i64)),
-              _ => Err(~"Can't cast str to int")
+        match /*bad*/copy base {
+            Err(_) => base,
+            Ok(val) => {
+                match ty::get(ety).sty {
+                    ty::ty_float(_) => match val {
+                        const_uint(u) => Ok(const_float(u as f64)),
+                        const_int(i) => Ok(const_float(i as f64)),
+                        const_float(_) => base,
+                        _ => Err(~"Can't cast float to str"),
+                    },
+                    ty::ty_uint(_) => match val {
+                        const_uint(_) => base,
+                        const_int(i) => Ok(const_uint(i as u64)),
+                        const_float(f) => Ok(const_uint(f as u64)),
+                        _ => Err(~"Can't cast str to uint"),
+                    },
+                    ty::ty_int(_) | ty::ty_bool => match val {
+                        const_uint(u) => Ok(const_int(u as i64)),
+                        const_int(_) => base,
+                        const_float(f) => Ok(const_int(f as i64)),
+                        _ => Err(~"Can't cast str to int"),
+                    },
+                    _ => Err(~"Can't cast this type")
+                }
             }
-          }
-          _ => Err(~"Can't cast this type")
         }
       }
       expr_path(_) => {