Fix the handling of type params on generic static methods. Closes #7571.

Author: msullivan

src/librustc/middle/typeck/collect.rs

@@ -278,7 +278,7 @@ pub fn ensure_trait_methods(ccx: &CrateCtxt,
         // Represents [A',B',C']
         let num_trait_bounds = trait_ty_generics.type_param_defs.len();
         let non_shifted_trait_tps = do vec::from_fn(num_trait_bounds) |i| {
-            ty::mk_param(tcx, i, dummy_defid)
+            ty::mk_param(tcx, i, trait_ty_generics.type_param_defs[i].def_id)
         };
 
         // Represents [D']
@@ -288,7 +288,8 @@ pub fn ensure_trait_methods(ccx: &CrateCtxt,
         // Represents [E',F',G']
         let num_method_bounds = m.generics.type_param_defs.len();
         let shifted_method_tps = do vec::from_fn(num_method_bounds) |i| {
-            ty::mk_param(tcx, i + 1, dummy_defid)
+            ty::mk_param(tcx, i + num_trait_bounds + 1,
+                         m.generics.type_param_defs[i].def_id)
         };
 
         // build up the substitution from

src/test/run-pass/generic-static-methods.rs

@@ -0,0 +1,27 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+trait vec_utils<T> {
+    fn map_<U:Copy>(x: &Self, f: &fn(&T) -> U) -> ~[U];
+}
+
+impl<T> vec_utils<T> for ~[T] {
+    fn map_<U:Copy>(x: &~[T], f: &fn(&T) -> U) -> ~[U] {
+        let mut r = ~[];
+        for x.iter().advance |elt| {
+            r.push(f(elt));
+        }
+        r
+    }
+}
+
+fn main() {
+    assert_eq!(vec_utils::map_(&~[1,2,3], |&x| x+1), ~[2,3,4]);
+}