---

catamorphism · catamorphism · commit 5f2741df17de · 2012-06-06T15:45:49.000-07:00
yaml --- r: 13289 b: refs/heads/master c: 32e448e h: refs/heads/master i: 13287: 84b2b30 v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: a5c9e8d59ed49725550ebd9e60871d51736393b4
+refs/heads/master: 32e448e0da9fd1e93c5bcce953d1ffbc4193565a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
diff --git a/trunk/src/rustc/middle/ty.rs b/trunk/src/rustc/middle/ty.rs
@@ -1678,11 +1678,8 @@ fn is_instantiable(cx: ctxt, r_ty: t) -> bool {
 
           ty_class(did, substs) {
             vec::push(*seen, did);
-            let r = vec::any(lookup_class_fields(cx, did)) {|f|
-                let fty = ty::lookup_item_type(cx, f.id);
-                let sty = subst(cx, substs, fty.ty);
-                type_requires(cx, seen, r_ty, sty)
-            };
+            let r = vec::any(class_items_as_fields(cx, did, substs)) {|f|
+                      type_requires(cx, seen, r_ty, f.mt.ty)};
             vec::pop(*seen);
             r
           }

Original file line number	Diff line number	Diff line change
`@@ -1678,11 +1678,8 @@ fn is_instantiable(cx: ctxt, r_ty: t) -> bool {`
`1678`	`1678`
`1679`	`1679`	`ty_class(did, substs) {`
`1680`	`1680`	`vec::push(*seen, did);`
`1681`		`- let r = vec::any(lookup_class_fields(cx, did)) {\|f\|`
`1682`		`- let fty = ty::lookup_item_type(cx, f.id);`
`1683`		`- let sty = subst(cx, substs, fty.ty);`
`1684`		`- type_requires(cx, seen, r_ty, sty)`
`1685`		`- };`
	`1681`	`+ let r = vec::any(class_items_as_fields(cx, did, substs)) {\|f\|`
	`1682`	`+ type_requires(cx, seen, r_ty, f.mt.ty)};`
`1686`	`1683`	`vec::pop(*seen);`
`1687`	`1684`	`r`
`1688`	`1685`	`}`