---

yaml
---
r: 23791
b: refs/heads/master
c: c21b3ff
h: refs/heads/master
i:
  23789: a5f134e
  23787: 2e651b3
  23783: 7052506
  23775: c4839f7
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: b4d879a2ef67230813bc6e361787731ca8ecdb04
+refs/heads/master: c21b3ff81847e9c9bcce83f961dffa385fa059ae
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/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
     }
 }
 

trunk/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);
             }

trunk/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);
             }
             _ => {}