---

brson · brson · commit cfbe9458a895 · 2012-11-14T11:49:59.000-08:00
yaml --- r: 36276 b: refs/heads/try2 c: 234df9c h: refs/heads/master 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: f14240b1c87d074941910a369660d603d51ed6e2
+refs/heads/try2: 234df9cae0a1c677db0375cf1327555c3bdb78db
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
diff --git a/branches/try2/src/librustc/middle/typeck/check.rs b/branches/try2/src/librustc/middle/typeck/check.rs
@@ -1080,7 +1080,8 @@ fn check_expr_with_unifier(fcx: @fn_ctxt,
                         DontDerefArgs => {}
                     }
 
-                    bot |= check_expr_with_assignability(fcx, *arg, formal_ty);
+                    bot |= check_expr_with_assignability(fcx,
+                                                         *arg, formal_ty);
                     fcx.write_ty(arg.id, fcx.expr_ty(*arg));
 
                 }

Original file line number	Diff line number	Diff line change
`@@ -1080,7 +1080,8 @@ fn check_expr_with_unifier(fcx: @fn_ctxt,`
`1080`	`1080`	`DontDerefArgs => {}`
`1081`	`1081`	`}`
`1082`	`1082`
`1083`		`- bot \|= check_expr_with_assignability(fcx, *arg, formal_ty);`
	`1083`	`+ bot \|= check_expr_with_assignability(fcx,`
	`1084`	`+ *arg, formal_ty);`
`1084`	`1085`	`fcx.write_ty(arg.id, fcx.expr_ty(*arg));`
`1085`	`1086`
`1086`	`1087`	`}`