---

yaml
---
r: 57756
b: refs/heads/incoming
c: ab8068c
h: refs/heads/master
v: v3

Author: brendanzab

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: bf67eb2362b7d0f37012f2d6dac604c3bbacd2c6
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: f39152e07baf03fc1ff4c8b2c1678ac857b4a512
+refs/heads/incoming: ab8068c9f2cbcce4411020b04dafe2055044f96a
 refs/heads/dist-snap: 00dbbd01c2aee72982b3e0f9511ae1d4428c3ba9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/librustc/middle/const_eval.rs

@@ -299,9 +299,9 @@ pub 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)),
-              quot if b == 0 => Err(~"quotient zero"),
+              quot if b == 0 => Err(~"attempted quotient with a divisor of zero"),
               quot => Ok(const_int(a / b)),
-              rem if b == 0 => Err(~"remainder zero"),
+              rem if b == 0 => Err(~"attempted remainder with a divisor of zero"),
               rem => Ok(const_int(a % b)),
               and | bitand => Ok(const_int(a & b)),
               or | bitor => Ok(const_int(a | b)),
@@ -321,9 +321,9 @@ pub 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)),
-              quot if b == 0 => Err(~"quotient zero"),
+              quot if b == 0 => Err(~"attempted quotient with a divisor of zero"),
               quot => Ok(const_uint(a / b)),
-              rem if b == 0 => Err(~"remainder zero"),
+              rem if b == 0 => Err(~"attempted remainder with a divisor of zero"),
               rem => Ok(const_uint(a % b)),
               and | bitand => Ok(const_uint(a & b)),
               or | bitor => Ok(const_uint(a | b)),

branches/incoming/src/librustc/middle/trans/base.rs

@@ -785,9 +785,9 @@ pub fn cast_shift_rhs(op: ast::binop,
 pub fn fail_if_zero(cx: block, span: span, quotrem: ast::binop,
                     rhs: ValueRef, rhs_t: ty::t) -> block {
     let text = if quotrem == ast::quot {
-        @~"quotient zero"
+        @~"attempted quotient with a divisor of zero"
     } else {
-        @~"remainder zero"
+        @~"attempted remainder with a divisor of zero"
     };
     let is_zero = match ty::get(rhs_t).sty {
       ty::ty_int(t) => {

branches/incoming/src/test/compile-fail/eval-enum.rs

@@ -1,6 +1,6 @@
 enum test {
-    quot_zero = 1/0, //~ERROR expected constant: quotient zero
-    rem_zero = 1%0  //~ERROR expected constant: remainder zero
+    quot_zero = 1/0, //~ERROR expected constant: attempted quotient with a divisor of zero
+    rem_zero = 1%0  //~ERROR expected constant: attempted remainder with a divisor of zero
 }
 
 fn main() {}

branches/incoming/src/test/run-fail/divide-by-zero.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern:quotient zero
+// error-pattern:attempted quotient with a divisor of zero
 fn main() {
     let y = 0;
     let z = 1 / y;

branches/incoming/src/test/run-fail/mod-zero.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern:remainder zero
+// error-pattern:attempted remainder with a divisor of zero
 fn main() {
     let y = 0;
     let z = 1 % y;