---

brson · brson · commit 3f7d4b20371a · 2012-09-09T17:23:29.000-07:00
yaml --- r: 30434 b: refs/heads/incoming c: e0c2320 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 528373b79b63ef9104325bb71cfcf39752352b80
+refs/heads/incoming: e0c232025c2a175069de3dd30b52b0ac2dbc2f65
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/incoming/src/rustc/middle/typeck/infer/combine.rs b/branches/incoming/src/rustc/middle/typeck/infer/combine.rs
@@ -487,7 +487,8 @@ fn super_tys<C:combine>(
             map_vec2(as_, bs, |a, b| self.tys(a, b) )
                 .chain(|ts| Ok(ty::mk_tup(tcx, ts)) )
         } else {
-            Err(ty::terr_tuple_size(expected_found(self, as_.len(), bs.len())))
+            Err(ty::terr_tuple_size(
+                expected_found(self, as_.len(), bs.len())))
         }
       }
 

Original file line number	Diff line number	Diff line change
`@@ -487,7 +487,8 @@ fn super_tys<C:combine>(`
`487`	`487`	`map_vec2(as_, bs, \|a, b\| self.tys(a, b) )`
`488`	`488`	`.chain(\|ts\| Ok(ty::mk_tup(tcx, ts)) )`
`489`	`489`	`} else {`
`490`		`- Err(ty::terr_tuple_size(expected_found(self, as_.len(), bs.len())))`
	`490`	`+ Err(ty::terr_tuple_size(`
	`491`	`+ expected_found(self, as_.len(), bs.len())))`
`491`	`492`	`}`
`492`	`493`	`}`
`493`	`494`