---

yaml
---
r: 3297
b: refs/heads/master
c: 1a6d029
h: refs/heads/master
i:
  3295: 9157c73
v: v3

Author: catamorphism

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: efd8ff46477caa89814bd5322619707873441c55
+refs/heads/master: 1a6d029b075c2006f6a49c5ca4a062bc2a713cd5

trunk/src/comp/middle/ty.rs

@@ -2580,18 +2580,23 @@ fn type_err_to_str(&ty::type_err err) -> str {
 
 // Converts type parameters in a type to type variables and returns the
 // resulting type along with a list of type variable IDs.
-fn bind_params_in_type(&ctxt cx, fn() -> int  next_ty_var, t typ,
+fn bind_params_in_type(&span sp, &ctxt cx, fn() -> int  next_ty_var, t typ,
                        uint ty_param_count) -> tup(vec[int], t) {
     let vec[int] param_var_ids = [];
     auto i = 0u;
     while (i < ty_param_count) { param_var_ids += [next_ty_var()]; i += 1u; }
-    fn binder(ctxt cx, vec[int] param_var_ids, fn() -> int  next_ty_var,
-              uint index) -> t {
-        ret mk_var(cx, param_var_ids.(index));
+    fn binder(span sp, ctxt cx, vec[int] param_var_ids,
+              fn() -> int next_ty_var, uint index) -> t {
+        if (index < vec::len(param_var_ids)) {
+            ret mk_var(cx, param_var_ids.(index));
+        }
+        else {
+            cx.sess.span_fatal(sp, "Unbound type parameter in callee's type");
+        }
     }
     auto new_typ =
-        fold_ty(cx, fm_param(bind binder(cx, param_var_ids, next_ty_var, _)),
-                typ);
+        fold_ty(cx, fm_param(bind binder(sp, cx, param_var_ids,
+                                         next_ty_var, _)), typ);
     ret tup(param_var_ids, new_typ);
 }
 

trunk/src/comp/middle/typeck.rs

@@ -132,7 +132,7 @@ fn instantiate_path(&@fn_ctxt fcx, &ast::path pth, &ty_param_count_and_ty tpt,
                     &span sp) -> ty_param_substs_opt_and_ty {
     auto ty_param_count = tpt._0;
     auto bind_result =
-        bind_params_in_type(fcx.ccx.tcx, bind next_ty_var_id(fcx), tpt._1,
+        bind_params_in_type(sp, fcx.ccx.tcx, bind next_ty_var_id(fcx), tpt._1,
                             ty_param_count);
     auto ty_param_vars = bind_result._0;
     auto t = bind_result._1;

trunk/src/test/compile-fail/nested-ty-params.rs

@@ -0,0 +1,11 @@
+// error-pattern:Unbound type parameter in callee
+/* I'm actually not sure whether this should compile.
+   But having a nice error message seems better than
+   a bounds check failure (which is what was happening
+   before.) */
+fn hd[U](&vec[U] v) -> U {
+  fn hd1(&vec[U] w) -> U {
+    ret w.(0);
+  }
+  ret hd1(v);
+}