---

yaml
---
r: 3199
b: refs/heads/master
c: a4d88da
h: refs/heads/master
i:
  3197: 0b3c30d
  3195: ebe5550
  3191: 7ffce30
  3183: fd7c202
  3167: 00683a1
  3135: 9f7c8cf
  3071: fa4a634
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2a69db5b769957c7deb89868d626b31f6e502757
+refs/heads/master: a4d88dacc9dd70547ece3dcc65fbc61a8fcfa91d

trunk/src/comp/middle/ty.rs

@@ -1943,7 +1943,12 @@ mod unify {
                 alt (struct(cx.tcx, expected)) {
                     case (ty::ty_var(?expected_id)) {
                         auto expected_n = expected_id as uint;
-                        union(cx, expected_n, actual_n);
+                        alt(union(cx, expected_n, actual_n)) {
+                            case (unres_ok) { /* fall through */ }
+                            case (unres_err(?t_e)) {
+                                ret ures_err(t_e);
+                            }
+                        }
                     }
                     case (_) {
 

trunk/src/test/compile-fail/binop-typeck.rs

@@ -0,0 +1,9 @@
+// xfail-stage0
+// error-pattern:mismatched types
+// issue #500
+
+fn main() {
+  auto x = true;
+  auto y = 1;
+  auto z = x + y;
+}