Spell out these diagnostics more, they are embarassing, but we should fix that not hide it.

Author: lattner

test/NameBinding/name-binding.swift

@@ -50,8 +50,8 @@ func test_varname_binding() {
   var (d, e) = (c.1, c.0)
   var ((), (g1, g2), h) = ((), (e, d), e)
   var (j, k, l) = callee1()
-  var (m, n) = callee1() // expected-error{{different number of elements}}
-  var (o, p, q, r) = callee1() // expected-error{{different number of elements}}
+  var (m, n) = callee1() // expected-error{{'(Int, Int, Int)' is not convertible to '((Int, Int, Int), (Int, Int, Int))', tuples have a different number of elements}}
+  var (o, p, q, r) = callee1() // expected-error{{'(Int, Int, Int)' is not convertible to '((Int, Int, Int), (Int, Int, Int), (Int, Int, Int), (Int, Int, Int))', tuples have a different number of elements}}
 }
 
 //===----------------------------------------------------------------------===//

test/expr/expressions.swift

@@ -128,7 +128,7 @@ func errorRecovery() {
   var f: (Int,Int) = (1, 2, f : 3) // expected-error {{cannot convert value of type '(Int, Int, f: Int)' to specified type '(Int, Int)'}}
 
   // <rdar://problem/22426860> CrashTracer: [USER] swift at …mous_namespace::ConstraintGenerator::getTypeForPattern + 698
-  var (g1, g2, g3) = (1, 2) // expected-error {{different number of elements}}
+  var (g1, g2, g3) = (1, 2) // expected-error {{'(Int, Int)' is not convertible to '((Int, Int), (Int, Int), (Int, Int))', tuples have a different number of elements}}
 }
 
 func acceptsInt(x: Int) {}