diff options
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/auxiliary/issue-2526.rs | 2 | ||||
| -rw-r--r-- | src/test/auxiliary/test_comm.rs | 4 | ||||
| -rw-r--r-- | src/test/bench/task-perf-word-count-generic.rs | 12 | ||||
| -rw-r--r-- | src/test/compile-fail/issue-2718-a.rs | 2 | ||||
| -rw-r--r-- | src/test/run-fail/bug-811.rs | 2 | ||||
| -rw-r--r-- | src/test/run-fail/issue-2444.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/auto-encode.rs | 5 | ||||
| -rw-r--r-- | src/test/run-pass/box-unbox.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/class-impl-very-parameterized-trait.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/generic-exterior-box.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/generic-exterior-unique.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/issue-2288.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/issue-2311-2.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/issue-2445-b.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/issue-2445.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/issue-2718.rs | 6 | ||||
| -rw-r--r-- | src/test/run-pass/issue-3149.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/reflect-visit-data.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/resource-generic.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/send-type-inference.rs | 2 | 
20 files changed, 27 insertions, 32 deletions
| diff --git a/src/test/auxiliary/issue-2526.rs b/src/test/auxiliary/issue-2526.rs index a14cc3758b1..fc5cf127518 100644 --- a/src/test/auxiliary/issue-2526.rs +++ b/src/test/auxiliary/issue-2526.rs @@ -17,7 +17,7 @@ extern mod std; export context; -struct arc_destruct<T:Const> { +struct arc_destruct<T> { _data: int, } diff --git a/src/test/auxiliary/test_comm.rs b/src/test/auxiliary/test_comm.rs index af321b9959f..6fd39368bae 100644 --- a/src/test/auxiliary/test_comm.rs +++ b/src/test/auxiliary/test_comm.rs @@ -24,7 +24,7 @@ use core::libc::size_t; * transmitted. If a port value is copied, both copies refer to the same * port. Ports may be associated with multiple `chan`s. */ -pub enum port<T: Owned> { +pub enum port<T> { port_t(@port_ptr<T>) } @@ -35,7 +35,7 @@ pub fn port<T: Owned>() -> port<T> { } } -struct port_ptr<T:Owned> { +struct port_ptr<T> { po: *rust_port, } diff --git a/src/test/bench/task-perf-word-count-generic.rs b/src/test/bench/task-perf-word-count-generic.rs index 21709a487e8..17444018356 100644 --- a/src/test/bench/task-perf-word-count-generic.rs +++ b/src/test/bench/task-perf-word-count-generic.rs @@ -122,15 +122,15 @@ mod map_reduce { use std::map::HashMap; use std::map; - pub type putter<K: Owned, V: Owned> = fn(&K, V); + pub type putter<K, V> = fn(&K, V); - pub type mapper<K1: Owned, K2: Owned, V: Owned> = fn~(K1, putter<K2, V>); + pub type mapper<K1, K2, V> = fn~(K1, putter<K2, V>); - pub type getter<V: Owned> = fn() -> Option<V>; + pub type getter<V> = fn() -> Option<V>; - pub type reducer<K: Copy Owned, V: Copy Owned> = fn~(&K, getter<V>); + pub type reducer<K, V> = fn~(&K, getter<V>); - enum ctrl_proto<K: Copy Owned, V: Copy Owned> { + enum ctrl_proto<K, V> { find_reducer(K, Chan<Chan<::map_reduce::reduce_proto<V>>>), mapper_done } @@ -148,7 +148,7 @@ mod map_reduce { } ) - pub enum reduce_proto<V: Copy Owned> { + pub enum reduce_proto<V> { emit_val(V), done, addref, diff --git a/src/test/compile-fail/issue-2718-a.rs b/src/test/compile-fail/issue-2718-a.rs index 2332d54037f..925350d9b88 100644 --- a/src/test/compile-fail/issue-2718-a.rs +++ b/src/test/compile-fail/issue-2718-a.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -pub struct send_packet<T: Copy> { +pub struct send_packet<T> { p: T } diff --git a/src/test/run-fail/bug-811.rs b/src/test/run-fail/bug-811.rs index 739bf097d4f..31158df4185 100644 --- a/src/test/run-fail/bug-811.rs +++ b/src/test/run-fail/bug-811.rs @@ -14,7 +14,7 @@ fn test00_start(ch: chan_t<int>, message: int) { send(ch, message); } type task_id = int; type port_id = int; -enum chan_t<T: Owned> = {task: task_id, port: port_id}; +enum chan_t<T> = {task: task_id, port: port_id}; fn send<T: Owned>(ch: chan_t<T>, data: T) { fail; } diff --git a/src/test/run-fail/issue-2444.rs b/src/test/run-fail/issue-2444.rs index b1d8c99faa5..9172364a2f9 100644 --- a/src/test/run-fail/issue-2444.rs +++ b/src/test/run-fail/issue-2444.rs @@ -13,7 +13,7 @@ extern mod std; use std::arc; -enum e<T: Const Owned> { e(arc::ARC<T>) } +enum e<T> { e(arc::ARC<T>) } fn foo() -> e<int> {fail;} diff --git a/src/test/run-pass/auto-encode.rs b/src/test/run-pass/auto-encode.rs index ec73704ca27..ee8cf89d528 100644 --- a/src/test/run-pass/auto-encode.rs +++ b/src/test/run-pass/auto-encode.rs @@ -135,11 +135,6 @@ struct Spanned<T> { node: T, } -enum AnEnum { - AVariant, - AnotherVariant -} - #[auto_encode] #[auto_decode] struct SomeStruct { v: ~[uint] } diff --git a/src/test/run-pass/box-unbox.rs b/src/test/run-pass/box-unbox.rs index 35585014713..ad32ffc75c9 100644 --- a/src/test/run-pass/box-unbox.rs +++ b/src/test/run-pass/box-unbox.rs @@ -10,7 +10,7 @@ -struct Box<T: Copy> {c: @T} +struct Box<T> {c: @T} fn unbox<T: Copy>(b: Box<T>) -> T { return *b.c; } diff --git a/src/test/run-pass/class-impl-very-parameterized-trait.rs b/src/test/run-pass/class-impl-very-parameterized-trait.rs index 6bc88188452..bccb42c4938 100644 --- a/src/test/run-pass/class-impl-very-parameterized-trait.rs +++ b/src/test/run-pass/class-impl-very-parameterized-trait.rs @@ -27,7 +27,7 @@ impl cat_type : cmp::Eq { // for any int value that's less than the meows field // ok: T should be in scope when resolving the trait ref for map -struct cat<T: Copy> { +struct cat<T> { // Yes, you can have negative meows priv mut meows : int, diff --git a/src/test/run-pass/generic-exterior-box.rs b/src/test/run-pass/generic-exterior-box.rs index 738bb73b0be..c2abcc75283 100644 --- a/src/test/run-pass/generic-exterior-box.rs +++ b/src/test/run-pass/generic-exterior-box.rs @@ -10,7 +10,7 @@ -struct Recbox<T: Copy> {x: @T} +struct Recbox<T> {x: @T} fn reclift<T: Copy>(t: T) -> Recbox<T> { return Recbox {x: @t}; } diff --git a/src/test/run-pass/generic-exterior-unique.rs b/src/test/run-pass/generic-exterior-unique.rs index 2095578aefa..a4a576abc75 100644 --- a/src/test/run-pass/generic-exterior-unique.rs +++ b/src/test/run-pass/generic-exterior-unique.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -struct Recbox<T: Copy> {x: ~T} +struct Recbox<T> {x: ~T} fn reclift<T: Copy>(t: T) -> Recbox<T> { return Recbox {x: ~t}; } diff --git a/src/test/run-pass/issue-2288.rs b/src/test/run-pass/issue-2288.rs index 52b3baba58e..0fa06e2f212 100644 --- a/src/test/run-pass/issue-2288.rs +++ b/src/test/run-pass/issue-2288.rs @@ -11,7 +11,7 @@ trait clam<A: Copy> { fn chowder(y: A); } -struct foo<A: Copy> { +struct foo<A> { x: A, } diff --git a/src/test/run-pass/issue-2311-2.rs b/src/test/run-pass/issue-2311-2.rs index 10befa74228..21201d0a957 100644 --- a/src/test/run-pass/issue-2311-2.rs +++ b/src/test/run-pass/issue-2311-2.rs @@ -9,7 +9,7 @@ // except according to those terms. trait clam<A: Copy> { } -struct foo<A: Copy> { +struct foo<A> { x: A, } diff --git a/src/test/run-pass/issue-2445-b.rs b/src/test/run-pass/issue-2445-b.rs index 35d3d089709..f1b7d45e440 100644 --- a/src/test/run-pass/issue-2445-b.rs +++ b/src/test/run-pass/issue-2445-b.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -struct c1<T: Copy> { +struct c1<T> { x: T, } diff --git a/src/test/run-pass/issue-2445.rs b/src/test/run-pass/issue-2445.rs index 7cf681c9f94..fada6a7b02e 100644 --- a/src/test/run-pass/issue-2445.rs +++ b/src/test/run-pass/issue-2445.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -struct c1<T: Copy> { +struct c1<T> { x: T, } diff --git a/src/test/run-pass/issue-2718.rs b/src/test/run-pass/issue-2718.rs index f8f2fc461c3..68a318eab4e 100644 --- a/src/test/run-pass/issue-2718.rs +++ b/src/test/run-pass/issue-2718.rs @@ -34,7 +34,7 @@ pub mod pipes { pure fn ne(&self, other: &state) -> bool { !(*self).eq(other) } } - pub type packet<T: Owned> = { + pub type packet<T> = { mut state: state, mut blocked_task: Option<task::Task>, mut payload: Option<T> @@ -157,7 +157,7 @@ pub mod pipes { } } - pub struct send_packet<T: Owned> { + pub struct send_packet<T> { mut p: Option<*packet<T>>, } @@ -185,7 +185,7 @@ pub mod pipes { } } - pub struct recv_packet<T: Owned> { + pub struct recv_packet<T> { mut p: Option<*packet<T>>, } diff --git a/src/test/run-pass/issue-3149.rs b/src/test/run-pass/issue-3149.rs index 533106ff936..c578f1144a7 100644 --- a/src/test/run-pass/issue-3149.rs +++ b/src/test/run-pass/issue-3149.rs @@ -22,7 +22,7 @@ pure fn Matrix4<T:Copy Num>(m11: T, m12: T, m13: T, m14: T, } } -struct Matrix4<T:Copy Num> { +struct Matrix4<T> { m11: T, m12: T, m13: T, m14: T, m21: T, m22: T, m23: T, m24: T, m31: T, m32: T, m33: T, m34: T, diff --git a/src/test/run-pass/reflect-visit-data.rs b/src/test/run-pass/reflect-visit-data.rs index d072df4d8e8..cf0a0a07397 100644 --- a/src/test/run-pass/reflect-visit-data.rs +++ b/src/test/run-pass/reflect-visit-data.rs @@ -29,7 +29,7 @@ fn align(size: uint, align: uint) -> uint { ((size + align) - 1u) & !(align - 1u) } -enum ptr_visit_adaptor<V: TyVisitor movable_ptr> = Inner<V>; +enum ptr_visit_adaptor<V> = Inner<V>; impl<V: TyVisitor movable_ptr> ptr_visit_adaptor<V> { diff --git a/src/test/run-pass/resource-generic.rs b/src/test/run-pass/resource-generic.rs index e528cd32974..7165d6089e8 100644 --- a/src/test/run-pass/resource-generic.rs +++ b/src/test/run-pass/resource-generic.rs @@ -13,7 +13,7 @@ struct Arg<T> {val: T, fin: extern fn(T)} -struct finish<T: Copy> { +struct finish<T> { arg: Arg<T> } diff --git a/src/test/run-pass/send-type-inference.rs b/src/test/run-pass/send-type-inference.rs index 8476e256cd2..8cb597a0d79 100644 --- a/src/test/run-pass/send-type-inference.rs +++ b/src/test/run-pass/send-type-inference.rs @@ -9,7 +9,7 @@ // except according to those terms. // tests that ctrl's type gets inferred properly -type command<K: Owned, V: Owned> = {key: K, val: V}; +type command<K, V> = {key: K, val: V}; fn cache_server<K: Owned, V: Owned>(c: oldcomm::Chan<oldcomm::Chan<command<K, V>>>) { let ctrl = oldcomm::Port(); | 
