---

brson · brson · commit 382216118819 · 2012-09-09T17:23:29.000-07:00
yaml --- r: 21726 b: refs/heads/snap-stage3 c: e0c2320 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 528373b79b63ef9104325bb71cfcf39752352b80
+refs/heads/snap-stage3: e0c232025c2a175069de3dd30b52b0ac2dbc2f65
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
diff --git a/branches/snap-stage3/src/rustc/middle/typeck/infer/combine.rs b/branches/snap-stage3/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`