---

yaml
---
r: 38395
b: refs/heads/try
c: 3e7da96
h: refs/heads/master
i:
  38393: 1725045
  38391: 67f49a5
v: v3

Author: catamorphism

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 09bb07bed9166105ea961a42b5fff7739ae0d2e9
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
-refs/heads/try: 30c308b952def6b0967c88556e153f1507fb3529
+refs/heads/try: 3e7da96fd22faf8587c1717e03a988dce6893bdb
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/src/libstd/json.rs

@@ -926,22 +926,20 @@ pub impl Decoder: serialize::Decoder {
 
 impl Json : Eq {
     pure fn eq(&self, other: &Json) -> bool {
-        // XXX: This is ugly because matching on references is broken, and
-        // we can't match on dereferenced tuples without a copy.
-        match (*self) {
-            Number(f0) =>
-                match *other { Number(f1) => f0 == f1, _ => false },
-            String(ref s0) =>
-                match *other { String(ref s1) => s0 == s1, _ => false },
-            Boolean(b0) =>
-                match *other { Boolean(b1) => b0 == b1, _ => false },
-            Null =>
-                match *other { Null => true, _ => false },
-            List(ref v0) =>
-                match *other { List(ref v1) => v0 == v1, _ => false },
-            Object(ref d0) => {
-                match *other {
-                    Object(ref d1) => {
+        match (self) {
+            &Number(f0) =>
+                match other { &Number(f1) => f0 == f1, _ => false },
+            &String(ref s0) =>
+                match other { &String(ref s1) => s0 == s1, _ => false },
+            &Boolean(b0) =>
+                match other { &Boolean(b1) => b0 == b1, _ => false },
+            &Null =>
+                match other { &Null => true, _ => false },
+            &List(ref v0) =>
+                match other { &List(ref v1) => v0 == v1, _ => false },
+            &Object(ref d0) => {
+                match other {
+                    &Object(ref d1) => {
                         if d0.len() == d1.len() {
                             let mut equal = true;
                             for d0.each |k, v0| {
@@ -960,7 +958,7 @@ impl Json : Eq {
             }
         }
     }
-    pure fn ne(&self, other: &Json) -> bool { !(*self).eq(other) }
+    pure fn ne(&self, other: &Json) -> bool { !self.eq(other) }
 }
 
 /// Test if two json values are less than one another
@@ -1007,7 +1005,7 @@ impl Json : Ord {
                             let mut d0_flat = ~[];
                             let mut d1_flat = ~[];
 
-                            // XXX: this is horribly inefficient...
+                            // FIXME #4430: this is horribly inefficient...
                             for d0.each |k, v| {
                                  d0_flat.push((@copy *k, @copy *v));
                             }