From cfdf193c4671a11e40743748d9cded9603386346 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 25 Oct 2011 15:56:55 +0200
Subject: Update our code to new type parameter kind syntax

Closes #1067
---
 src/test/stdtest/deque.rs | 6 +++---
 src/test/stdtest/task.rs  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/test/stdtest')

diff --git a/src/test/stdtest/deque.rs b/src/test/stdtest/deque.rs
index d532d975535..fac7aa3a853 100644
--- a/src/test/stdtest/deque.rs
+++ b/src/test/stdtest/deque.rs
@@ -81,7 +81,7 @@ fn test_boxes(a: @int, b: @int, c: @int, d: @int) {
 
 type eqfn<T> = fn@(T, T) -> bool;
 
-fn test_parameterized<@T>(e: eqfn<T>, a: T, b: T, c: T, d: T) {
+fn test_parameterized<T>(e: eqfn<T>, a: T, b: T, c: T, d: T) {
     let deq: deque::t<T> = deque::create::<T>();
     assert (deq.size() == 0u);
     deq.add_front(a);
@@ -113,7 +113,7 @@ fn test_parameterized<@T>(e: eqfn<T>, a: T, b: T, c: T, d: T) {
 
 tag taggy { one(int); two(int, int); three(int, int, int); }
 
-tag taggypar<@T> { onepar(int); twopar(int, int); threepar(int, int, int); }
+tag taggypar<T> { onepar(int); twopar(int, int); threepar(int, int, int); }
 
 type reccy = {x: int, y: int, t: taggy};
 
@@ -138,7 +138,7 @@ fn test() {
           }
         }
     }
-    fn taggypareq<@T>(a: taggypar<T>, b: taggypar<T>) -> bool {
+    fn taggypareq<T>(a: taggypar<T>, b: taggypar<T>) -> bool {
         alt a {
           onepar::<T>(a1) {
             alt b { onepar::<T>(b1) { ret a1 == b1; } _ { ret false; } }
diff --git a/src/test/stdtest/task.rs b/src/test/stdtest/task.rs
index 1349831cb87..b12636a58c0 100644
--- a/src/test/stdtest/task.rs
+++ b/src/test/stdtest/task.rs
@@ -80,7 +80,7 @@ fn test_join_convenient() {
 #[ignore]
 fn spawn_polymorphic() {
     // FIXME #1038: Can't spawn palymorphic functions
-    /*fn foo<~T>(x: T) { log_err x; }
+    /*fn foo<unique T>(x: T) { log_err x; }
 
     task::spawn(true, foo);
     task::spawn(42, foo);*/
-- 
cgit 1.4.1-3-g733a5