---

nikomatsakis · nikomatsakis · commit e5aee8a6a45c · 2014-11-07T15:58:19.000-05:00
yaml --- r: 159003 b: refs/heads/auto c: cf4e53e h: refs/heads/master i: 159001: 02887cf 158999: 1815c18 v: v3
diff --git a/[refs] b/[refs]
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 091dc6e98a483c164735e9a0b9c5b3750a94a95f
+refs/heads/auto: cf4e53eee7377b42524176f39b0b428175c74fb1
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
diff --git a/branches/auto/src/librustc/middle/typeck/collect.rs b/branches/auto/src/librustc/middle/typeck/collect.rs
@@ -1155,7 +1155,8 @@ pub fn convert(ccx: &CrateCtxt, it: &ast::Item) {
                             parent_visibility);
 
             for trait_ref in opt_trait_ref.iter() {
-                astconv::instantiate_trait_ref(&icx, &ExplicitRscope, trait_ref, Some(selfty), None);
+                astconv::instantiate_trait_ref(&icx, &ExplicitRscope, trait_ref,
+                                               Some(selfty), None);
             }
         },
         ast::ItemTrait(_, _, _, ref trait_methods) => {

Original file line number	Diff line number	Diff line change
`@@ -1155,7 +1155,8 @@ pub fn convert(ccx: &CrateCtxt, it: &ast::Item) {`
`1155`	`1155`	`parent_visibility);`
`1156`	`1156`
`1157`	`1157`	`for trait_ref in opt_trait_ref.iter() {`
`1158`		`- astconv::instantiate_trait_ref(&icx, &ExplicitRscope, trait_ref, Some(selfty), None);`
	`1158`	`+ astconv::instantiate_trait_ref(&icx, &ExplicitRscope, trait_ref,`
	`1159`	`+ Some(selfty), None);`
`1159`	`1160`	`}`
`1160`	`1161`	`},`
`1161`	`1162`	`ast::ItemTrait(_, _, _, ref trait_methods) => {`