---

yaml
---
r: 30391
b: refs/heads/incoming
c: c21b3ff
h: refs/heads/master
i:
  30389: 779a304
  30387: 8b511a8
  30383: 3b4198a
v: v3

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: b4d879a2ef67230813bc6e361787731ca8ecdb04
+refs/heads/incoming: c21b3ff81847e9c9bcce83f961dffa385fa059ae
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libsyntax/ast_util.rs

@@ -110,7 +110,8 @@ pure fn binop_to_method_name(op: binop) -> Option<~str> {
       ge => return Some(~"ge"),
       gt => return Some(~"gt"),
       eq => return Some(~"eq"),
-      and | or | ne => return None
+      ne => return Some(~"ne"),
+      and | or => return None
     }
 }
 

branches/incoming/src/rustc/middle/resolve.rs

@@ -4530,7 +4530,7 @@ struct Resolver {
                 self.add_fixed_trait_for_expr(expr.id,
                                               self.lang_items.ord_trait);
             }
-            expr_binary(eq, _, _) => {
+            expr_binary(eq, _, _) | expr_binary(ne, _, _) => {
                 self.add_fixed_trait_for_expr(expr.id,
                                               self.lang_items.eq_trait);
             }

branches/incoming/src/rustc/middle/typeck/check.rs

@@ -1108,7 +1108,7 @@ fn check_expr_with_unifier(fcx: @fn_ctxt,
 
         // Hack: Unify the two sides if this is a relational operator.
         match op {
-            ast::eq | ast::lt | ast::le | ast::ne | ast::ge | ast::gt => {
+            ast::eq | ast::ne | ast::lt | ast::le | ast::ge | ast::gt => {
                 check_expr_with(fcx, rhs, lhs_t);
             }
             _ => {}