---

yaml
---
r: 41894
b: refs/heads/master
c: 3ed39ce
h: refs/heads/master
v: v3

Author: sanxiyn

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 93e969e356dc8908a7eeef675269149f81a10eed
+refs/heads/master: 3ed39ce26ff6dbe3d3a8f4196b9226550cc6a979
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
 refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650

trunk/src/librustc/middle/const_eval.rs

@@ -295,7 +295,9 @@ fn eval_const_expr_partial(tcx: middle::ty::ctxt, e: @expr)
               add => Ok(const_int(a + b)),
               subtract => Ok(const_int(a - b)),
               mul => Ok(const_int(a * b)),
+              div if b == 0 => Err(~"divide by zero"),
               div => Ok(const_int(a / b)),
+              rem if b == 0 => Err(~"modulo zero"),
               rem => Ok(const_int(a % b)),
               and | bitand => Ok(const_int(a & b)),
               or | bitor => Ok(const_int(a | b)),
@@ -315,7 +317,9 @@ fn eval_const_expr_partial(tcx: middle::ty::ctxt, e: @expr)
               add => Ok(const_uint(a + b)),
               subtract => Ok(const_uint(a - b)),
               mul => Ok(const_uint(a * b)),
+              div if b == 0 => Err(~"divide by zero"),
               div => Ok(const_uint(a / b)),
+              rem if b == 0 => Err(~"modulo zero"),
               rem => Ok(const_uint(a % b)),
               and | bitand => Ok(const_uint(a & b)),
               or | bitor => Ok(const_uint(a | b)),

trunk/src/test/compile-fail/eval-enum.rs

@@ -0,0 +1,6 @@
+enum test {
+    div_zero = 1/0, //~ERROR expected constant: divide by zero
+    rem_zero = 1%0  //~ERROR expected constant: modulo zero
+}
+
+fn main() {}