---

pcwalton · pcwalton · commit c6acd512881a · 2012-03-26T12:49:14.000-07:00
yaml --- r: 12127 b: refs/heads/master c: d877ebd h: refs/heads/master i: 12125: 3c618fd 12123: ca98055 12119: 9a91be4 12111: 7281647 12095: e5dfbeb v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 407be5203659b10ba7391c035d494c6db0fd5487
+refs/heads/master: d877ebdd056de76cd98dbe6c7668f26a4a2cbd1c
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
diff --git a/trunk/src/rustc/middle/infer.rs b/trunk/src/rustc/middle/infer.rs
@@ -832,9 +832,6 @@ impl resolve_methods for infer_ctxt {
         }
     }
 
-    // FIXME: These should be integrated with the two functions above instead
-    // of being such blatant lazy duplicates.
-
     fn subst_regions(unresolved: @mutable option<int>,
                      regions_seen: std::list::list<int>,
                      rid: int) -> ty::region {

Original file line number	Diff line number	Diff line change
`@@ -832,9 +832,6 @@ impl resolve_methods for infer_ctxt {`
`832`	`832`	`}`
`833`	`833`	`}`
`834`	`834`
`835`		`- // FIXME: These should be integrated with the two functions above instead`
`836`		`- // of being such blatant lazy duplicates.`
`837`		`-`
`838`	`835`	`fn subst_regions(unresolved: @mutable option<int>,`
`839`	`836`	`regions_seen: std::list::list<int>,`
`840`	`837`	`rid: int) -> ty::region {`