---

yaml
---
r: 15183
b: refs/heads/try
c: fe610f0
h: refs/heads/master
i:
  15181: 6689480
  15179: 16dc1a2
  15175: 42d77fa
  15167: d234810
v: v3

Author: nikomatsakis

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 23f92ea3701d515ac617c4c9ad18d4b25ecd4675
+refs/heads/try: fe610f04d89ae30e7ad68b9b519aa8461cd8d0fb
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rustc/middle/typeck.rs

@@ -2362,11 +2362,13 @@ fn check_expr_with_unifier(fcx: @fn_ctxt, expr: @ast::expr, unify: unifier,
                          } else {
                              "s were"
                          }]);
-            // HACK: build an arguments list with dummy arguments to
-            // check against
-            let dummy = {mode: ast::expl(ast::by_ref),
-                         ty: ty::mk_bot(fcx.ccx.tcx)};
-            arg_tys = vec::from_elem(supplied_arg_count, dummy);
+
+            // Just use fresh type variables for the types,
+            // since we don't know them.
+            arg_tys = vec::from_fn(supplied_arg_count) {|_i|
+                {mode: ast::expl(ast::by_ref),
+                 ty: next_ty_var(fcx)}
+            };
         }
 
         // Check the arguments.

branches/try/src/test/compile-fail/not-enough-arguments.rs

@@ -0,0 +1,12 @@
+// Check that the only error msg we report is the
+// mismatch between the # of params, and not other
+// unrelated errors.
+
+fn foo(a: int, b: int, c: int, d:int) {
+  fail;
+}
+
+fn main() {
+  foo(1, 2, 3);
+  //!^ ERROR this function takes 4 parameters but 3
+}