---

pcwalton · pcwalton · commit 5cf466135eea · 2012-12-04T16:03:50.000-08:00
yaml --- r: 36541 b: refs/heads/try2 c: c0d3b29 h: refs/heads/master i: 36539: bd9b938 v: v3
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 33c1e47c1b09216e100951ba9e95a3c0c61c0cc7
+refs/heads/try2: c0d3b291d55122d319ddc28010675afdaab73dfc
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
diff --git a/branches/try2/src/librustc/middle/typeck/infer/unify.rs b/branches/try2/src/librustc/middle/typeck/infer/unify.rs
@@ -43,7 +43,7 @@ impl infer_ctxt {
             match (*var_val) {
               redirect(ref vid) => {
                 let node = self.get(vb, (*vid));
-                if node.root != (*vid) {
+                if node.root.ne(vid) {
                     // Path compression
                     vb.vals.insert((*vid).to_uint(), redirect(node.root));
                 }

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ impl infer_ctxt {`
`43`	`43`	`match (*var_val) {`
`44`	`44`	`redirect(ref vid) => {`
`45`	`45`	`let node = self.get(vb, (*vid));`
`46`		`- if node.root != (*vid) {`
	`46`	`+ if node.root.ne(vid) {`
`47`	`47`	`// Path compression`
`48`	`48`	`vb.vals.insert((*vid).to_uint(), redirect(node.root));`
`49`	`49`	`}`