Update our code to new type parameter kind syntax

Closes #1067

3 files changed, 12 insertions, 12 deletions

diff --git a/src/fuzzer/fuzzer.rs b/src/fuzzer/fuzzer.rs
index 04e7550533e..f99bff1cf47 100644
--- a/src/fuzzer/fuzzer.rs
+++ b/src/fuzzer/fuzzer.rs
@@ -227,7 +227,7 @@ fn check_variants_of_ast(crate: ast::crate, codemap: codemap::codemap,
     check_variants_T(crate, codemap, filename, "ty", stolen.tys, pprust::ty_to_str, replace_ty_in_crate, cx);
 }
 
-fn check_variants_T<@T>(
+fn check_variants_T<T>(
   crate: ast::crate,
   codemap: codemap::codemap,
   filename: str,
diff --git a/src/fuzzer/ivec_fuzz.rs b/src/fuzzer/ivec_fuzz.rs
index 4ede2f4482a..66b1a60f173 100644
--- a/src/fuzzer/ivec_fuzz.rs
+++ b/src/fuzzer/ivec_fuzz.rs
@@ -22,22 +22,22 @@ import std::vec::slice;
 import std::vec::len;
 import std::int;
 
-fn vec_omit<@T>(v: [T], i: uint) -> [T] {
+fn vec_omit<T>(v: [T], i: uint) -> [T] {
     slice(v, 0u, i) + slice(v, i + 1u, len(v))
 }
-fn vec_dup<@T>(v: [T], i: uint) -> [T] {
+fn vec_dup<T>(v: [T], i: uint) -> [T] {
     slice(v, 0u, i) + [v[i]] + slice(v, i, len(v))
 }
-fn vec_swadj<@T>(v: [T], i: uint) -> [T] {
+fn vec_swadj<T>(v: [T], i: uint) -> [T] {
     slice(v, 0u, i) + [v[i + 1u], v[i]] + slice(v, i + 2u, len(v))
 }
-fn vec_prefix<@T>(v: [T], i: uint) -> [T] { slice(v, 0u, i) }
-fn vec_suffix<@T>(v: [T], i: uint) -> [T] { slice(v, i, len(v)) }
+fn vec_prefix<T>(v: [T], i: uint) -> [T] { slice(v, 0u, i) }
+fn vec_suffix<T>(v: [T], i: uint) -> [T] { slice(v, i, len(v)) }
 
-fn vec_poke<@T>(v: [T], i: uint, x: T) -> [T] {
+fn vec_poke<T>(v: [T], i: uint, x: T) -> [T] {
     slice(v, 0u, i) + [x] + slice(v, i + 1u, len(v))
 }
-fn vec_insert<@T>(v: [T], i: uint, x: T) -> [T] {
+fn vec_insert<T>(v: [T], i: uint, x: T) -> [T] {
     slice(v, 0u, i) + [x] + slice(v, i, len(v))
 }
 
@@ -48,7 +48,7 @@ fn ix(skip_low: uint, skip_high: uint, length: uint, it: block(uint)) {
 }
 
 // Returns a bunch of modified versions of v, some of which introduce new elements (borrowed from xs).
-fn vec_edits<@T>(v: [T], xs: [T]) -> [[T]] {
+fn vec_edits<T>(v: [T], xs: [T]) -> [[T]] {
     let edits: [[T]] = [];
     let Lv: uint = len(v);
 
diff --git a/src/fuzzer/rand_util.rs b/src/fuzzer/rand_util.rs
index ad6fc958e76..d59cf06b2a2 100644
--- a/src/fuzzer/rand_util.rs
+++ b/src/fuzzer/rand_util.rs
@@ -12,7 +12,7 @@ fn choice<T>(r : rand::rng, v : [T]) -> T { assert vec::len(v) != 0u; v[under(r,
 fn unlikely(r : rand::rng, n : uint) -> bool { under(r, n) == 0u }
 
 // shuffle a vec in place
-fn shuffle<@T>(r : rand::rng, &v : [mutable T]) {
+fn shuffle<T>(r : rand::rng, &v : [mutable T]) {
     let i = vec::len(v);
     while i >= 2u {
         // Loop invariant: elements with index >= i have been locked in place.
@@ -22,7 +22,7 @@ fn shuffle<@T>(r : rand::rng, &v : [mutable T]) {
 }
 
 // create a shuffled copy of a vec
-fn shuffled<@T>(r : rand::rng, v : [T]) -> [T] {
+fn shuffled<T>(r : rand::rng, v : [T]) -> [T] {
     let w = vec::to_mut(v);
     shuffle(r, w);
     vec::from_mut(w) // Shouldn't this happen automatically?
@@ -35,7 +35,7 @@ fn shuffled<@T>(r : rand::rng, v : [T]) -> [T] {
 // * weighted_choice is O(number of choices) time
 // * weighted_vec is O(total weight) space
 type weighted<T> = { weight: uint, item: T };
-fn weighted_choice<@T>(r : rand::rng, v : [weighted<T>]) -> T {
+fn weighted_choice<T>(r : rand::rng, v : [weighted<T>]) -> T {
     assert vec::len(v) != 0u;
     let total = 0u;
     for {weight: weight, item: _} in v {