---

pcwalton · pcwalton · commit ea5d1b1eba5f · 2012-12-04T16:03:50.000-08:00
yaml --- r: 37822 b: refs/heads/try c: c0d3b29 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -2,7 +2,7 @@
 refs/heads/master: 09bb07bed9166105ea961a42b5fff7739ae0d2e9
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
-refs/heads/try: 33c1e47c1b09216e100951ba9e95a3c0c61c0cc7
+refs/heads/try: c0d3b291d55122d319ddc28010675afdaab73dfc
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
diff --git a/branches/try/src/librustc/middle/typeck/infer/unify.rs b/branches/try/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`	`}`