diff options
Diffstat (limited to 'src/test')
101 files changed, 190 insertions, 190 deletions
diff --git a/src/test/auxiliary/cci_capture_clause.rs b/src/test/auxiliary/cci_capture_clause.rs index 27400322e40..68d24ed28cb 100644 --- a/src/test/auxiliary/cci_capture_clause.rs +++ b/src/test/auxiliary/cci_capture_clause.rs @@ -2,7 +2,7 @@ export foo; use comm::*; -fn foo<T: send copy>(x: T) -> Port<T> { +fn foo<T: Send Copy>(x: T) -> Port<T> { let p = Port(); let c = Chan(p); do task::spawn() |copy c, copy x| { diff --git a/src/test/auxiliary/cci_nested_lib.rs b/src/test/auxiliary/cci_nested_lib.rs index 8a714740550..6ead738753e 100644 --- a/src/test/auxiliary/cci_nested_lib.rs +++ b/src/test/auxiliary/cci_nested_lib.rs @@ -3,11 +3,11 @@ use dvec::DVec; type entry<A,B> = {key: A, value: B}; type alist<A,B> = { eq_fn: fn@(A,A) -> bool, data: DVec<entry<A,B>> }; -fn alist_add<A: copy, B: copy>(lst: alist<A,B>, k: A, v: B) { +fn alist_add<A: Copy, B: Copy>(lst: alist<A,B>, k: A, v: B) { lst.data.push({key:k, value:v}); } -fn alist_get<A: copy, B: copy>(lst: alist<A,B>, k: A) -> B { +fn alist_get<A: Copy, B: Copy>(lst: alist<A,B>, k: A) -> B { let eq_fn = lst.eq_fn; for lst.data.each |entry| { if eq_fn(entry.key, k) { return entry.value; } @@ -16,13 +16,13 @@ fn alist_get<A: copy, B: copy>(lst: alist<A,B>, k: A) -> B { } #[inline] -fn new_int_alist<B: copy>() -> alist<int, B> { +fn new_int_alist<B: Copy>() -> alist<int, B> { fn eq_int(&&a: int, &&b: int) -> bool { a == b } return {eq_fn: eq_int, data: DVec()}; } #[inline] -fn new_int_alist_2<B: copy>() -> alist<int, B> { +fn new_int_alist_2<B: Copy>() -> alist<int, B> { #[inline] fn eq_int(&&a: int, &&b: int) -> bool { a == b } return {eq_fn: eq_int, data: DVec()}; diff --git a/src/test/auxiliary/issue-2526.rs b/src/test/auxiliary/issue-2526.rs index 14fe2b8fee9..ef977507dd2 100644 --- a/src/test/auxiliary/issue-2526.rs +++ b/src/test/auxiliary/issue-2526.rs @@ -7,18 +7,18 @@ use std; export context; -struct arc_destruct<T:const> { +struct arc_destruct<T:Const> { _data: int, drop {} } -fn arc_destruct<T: const>(data: int) -> arc_destruct<T> { +fn arc_destruct<T: Const>(data: int) -> arc_destruct<T> { arc_destruct { _data: data } } -fn arc<T: const>(_data: T) -> arc_destruct<T> { +fn arc<T: Const>(_data: T) -> arc_destruct<T> { arc_destruct(0) } diff --git a/src/test/auxiliary/issue-2631-a.rs b/src/test/auxiliary/issue-2631-a.rs index 35a35420636..4c3a6ea6121 100644 --- a/src/test/auxiliary/issue-2631-a.rs +++ b/src/test/auxiliary/issue-2631-a.rs @@ -10,6 +10,6 @@ use std::map::hashmap; type header_map = hashmap<~str, @DVec<@~str>>; // the unused ty param is necessary so this gets monomorphized -fn request<T: copy>(req: header_map) { +fn request<T: Copy>(req: header_map) { let _x = *(*req.get(~"METHOD"))[0u]; } diff --git a/src/test/auxiliary/static-methods-crate.rs b/src/test/auxiliary/static-methods-crate.rs index 954e1f66f51..cd011227c84 100644 --- a/src/test/auxiliary/static-methods-crate.rs +++ b/src/test/auxiliary/static-methods-crate.rs @@ -25,7 +25,7 @@ impl bool: read { } } -fn read<T: read copy>(s: ~str) -> T { +fn read<T: read Copy>(s: ~str) -> T { match readMaybe(s) { Some(x) => x, _ => fail ~"read failed!" diff --git a/src/test/auxiliary/test_comm.rs b/src/test/auxiliary/test_comm.rs index 20c5579e427..fed01e6a30e 100644 --- a/src/test/auxiliary/test_comm.rs +++ b/src/test/auxiliary/test_comm.rs @@ -18,16 +18,16 @@ export recv; * transmitted. If a port value is copied, both copies refer to the same * port. Ports may be associated with multiple `chan`s. */ -enum port<T: send> { +enum port<T: Send> { port_t(@port_ptr<T>) } /// Constructs a port -fn port<T: send>() -> port<T> { +fn port<T: Send>() -> port<T> { port_t(@port_ptr(rustrt::new_port(sys::size_of::<T>() as size_t))) } -struct port_ptr<T:send> { +struct port_ptr<T:Send> { po: *rust_port, drop unsafe { debug!("in the port_ptr destructor"); @@ -48,7 +48,7 @@ struct port_ptr<T:send> { } } -fn port_ptr<T: send>(po: *rust_port) -> port_ptr<T> { +fn port_ptr<T: Send>(po: *rust_port) -> port_ptr<T> { debug!("in the port_ptr constructor"); port_ptr { po: po @@ -59,11 +59,11 @@ fn port_ptr<T: send>(po: *rust_port) -> port_ptr<T> { * Receive from a port. If no data is available on the port then the * task will block until data becomes available. */ -fn recv<T: send>(p: port<T>) -> T { recv_((**p).po) } +fn recv<T: Send>(p: port<T>) -> T { recv_((**p).po) } /// Receive on a raw port pointer -fn recv_<T: send>(p: *rust_port) -> T { +fn recv_<T: Send>(p: *rust_port) -> T { let yield = 0u; let yieldp = ptr::addr_of(yield); let mut res; diff --git a/src/test/bench/pingpong.rs b/src/test/bench/pingpong.rs index 53132293de9..5e0f9072f6c 100644 --- a/src/test/bench/pingpong.rs +++ b/src/test/bench/pingpong.rs @@ -64,7 +64,7 @@ macro_rules! follow ( ) ) -fn switch<T: send, Tb: send, U>(+endp: pipes::RecvPacketBuffered<T, Tb>, +fn switch<T: Send, Tb: Send, U>(+endp: pipes::RecvPacketBuffered<T, Tb>, f: fn(+Option<T>) -> U) -> U { f(pipes::try_recv(endp)) } diff --git a/src/test/bench/shootout-k-nucleotide-pipes.rs b/src/test/bench/shootout-k-nucleotide-pipes.rs index 6d46d2b597e..5437de9643a 100644 --- a/src/test/bench/shootout-k-nucleotide-pipes.rs +++ b/src/test/bench/shootout-k-nucleotide-pipes.rs @@ -15,14 +15,14 @@ fn sort_and_fmt(mm: hashmap<~[u8], uint>, total: uint) -> ~str { return (xx as float) * 100f / (yy as float); } - pure fn le_by_val<TT: copy, UU: copy>(kv0: &(TT,UU), + pure fn le_by_val<TT: Copy, UU: Copy>(kv0: &(TT,UU), kv1: &(TT,UU)) -> bool { let (_, v0) = *kv0; let (_, v1) = *kv1; return v0 >= v1; } - pure fn le_by_key<TT: copy, UU: copy>(kv0: &(TT,UU), + pure fn le_by_key<TT: Copy, UU: Copy>(kv0: &(TT,UU), kv1: &(TT,UU)) -> bool { let (k0, _) = *kv0; let (k1, _) = *kv1; @@ -30,7 +30,7 @@ fn sort_and_fmt(mm: hashmap<~[u8], uint>, total: uint) -> ~str { } // sort by key, then by value - fn sortKV<TT: copy, UU: copy>(orig: ~[(TT,UU)]) -> ~[(TT,UU)] { + fn sortKV<TT: Copy, UU: Copy>(orig: ~[(TT,UU)]) -> ~[(TT,UU)] { return sort::merge_sort(le_by_val, sort::merge_sort(le_by_key, orig)); } diff --git a/src/test/bench/shootout-k-nucleotide.rs b/src/test/bench/shootout-k-nucleotide.rs index 578e9c433f3..5f907e55a1f 100644 --- a/src/test/bench/shootout-k-nucleotide.rs +++ b/src/test/bench/shootout-k-nucleotide.rs @@ -14,14 +14,14 @@ fn sort_and_fmt(mm: hashmap<~[u8], uint>, total: uint) -> ~str { return (xx as float) * 100f / (yy as float); } - pure fn le_by_val<TT: copy, UU: copy>(kv0: &(TT,UU), + pure fn le_by_val<TT: Copy, UU: Copy>(kv0: &(TT,UU), kv1: &(TT,UU)) -> bool { let (_, v0) = *kv0; let (_, v1) = *kv1; return v0 >= v1; } - pure fn le_by_key<TT: copy, UU: copy>(kv0: &(TT,UU), + pure fn le_by_key<TT: Copy, UU: Copy>(kv0: &(TT,UU), kv1: &(TT,UU)) -> bool { let (k0, _) = *kv0; let (k1, _) = *kv1; @@ -29,7 +29,7 @@ fn sort_and_fmt(mm: hashmap<~[u8], uint>, total: uint) -> ~str { } // sort by key, then by value - fn sortKV<TT: copy, UU: copy>(orig: ~[(TT,UU)]) -> ~[(TT,UU)] { + fn sortKV<TT: Copy, UU: Copy>(orig: ~[(TT,UU)]) -> ~[(TT,UU)] { return sort::merge_sort(le_by_val, sort::merge_sort(le_by_key, orig)); } diff --git a/src/test/bench/task-perf-word-count-generic.rs b/src/test/bench/task-perf-word-count-generic.rs index 646488c61c8..0469e7e40bf 100644 --- a/src/test/bench/task-perf-word-count-generic.rs +++ b/src/test/bench/task-perf-word-count-generic.rs @@ -39,9 +39,9 @@ trait hash_key { pure fn eq(&&k: self) -> bool; } -fn mk_hash<K: const hash_key, V: copy>() -> map::hashmap<K, V> { - pure fn hashfn<K: const hash_key>(k: &K) -> uint { k.hash() } - pure fn hasheq<K: const hash_key>(k1: &K, k2: &K) -> bool { k1.eq(*k2) } +fn mk_hash<K: Const hash_key, V: Copy>() -> map::hashmap<K, V> { + pure fn hashfn<K: Const hash_key>(k: &K) -> uint { k.hash() } + pure fn hasheq<K: Const hash_key>(k1: &K, k2: &K) -> bool { k1.eq(*k2) } map::hashmap(hashfn, hasheq) } @@ -125,35 +125,35 @@ mod map_reduce { export reducer; export map_reduce; - type putter<K: send, V: send> = fn(K, V); + type putter<K: Send, V: Send> = fn(K, V); - type mapper<K1: send, K2: send, V: send> = fn~(K1, putter<K2, V>); + type mapper<K1: Send, K2: Send, V: Send> = fn~(K1, putter<K2, V>); - type getter<V: send> = fn() -> Option<V>; + type getter<V: Send> = fn() -> Option<V>; - type reducer<K: copy send, V: copy send> = fn~(K, getter<V>); + type reducer<K: Copy Send, V: Copy Send> = fn~(K, getter<V>); - enum ctrl_proto<K: copy send, V: copy send> { + enum ctrl_proto<K: Copy Send, V: Copy Send> { find_reducer(K, Chan<Chan<reduce_proto<V>>>), mapper_done } proto! ctrl_proto ( - open: send<K: copy send, V: copy send> { + open: send<K: Copy Send, V: Copy Send> { find_reducer(K) -> reducer_response<K, V>, mapper_done -> ! } - reducer_response: recv<K: copy send, V: copy send> { + reducer_response: recv<K: Copy Send, V: Copy Send> { reducer(Chan<reduce_proto<V>>) -> open<K, V> } ) - enum reduce_proto<V: copy send> { emit_val(V), done, addref, release } + enum reduce_proto<V: Copy Send> { emit_val(V), done, addref, release } - fn start_mappers<K1: copy send, K2: const copy send hash_key, - V: copy send>( + fn start_mappers<K1: Copy Send, K2: Const Copy Send hash_key, + V: Copy Send>( map: mapper<K1, K2, V>, &ctrls: ~[ctrl_proto::server::open<K2, V>], inputs: ~[K1]) @@ -169,7 +169,7 @@ mod map_reduce { return tasks; } - fn map_task<K1: copy send, K2: const copy send hash_key, V: copy send>( + fn map_task<K1: Copy Send, K2: Const Copy Send hash_key, V: Copy Send>( map: mapper<K1, K2, V>, ctrl: box<ctrl_proto::client::open<K2, V>>, input: K1) @@ -198,7 +198,7 @@ mod map_reduce { send(c.get(), emit_val(val)); } - fn finish<K: copy send, V: copy send>(_k: K, v: Chan<reduce_proto<V>>) + fn finish<K: Copy Send, V: Copy Send>(_k: K, v: Chan<reduce_proto<V>>) { send(v, release); } @@ -206,7 +206,7 @@ mod map_reduce { ctrl_proto::client::mapper_done(ctrl.unwrap()); } - fn reduce_task<K: copy send, V: copy send>( + fn reduce_task<K: Copy Send, V: Copy Send>( reduce: reducer<K, V>, key: K, out: Chan<Chan<reduce_proto<V>>>) @@ -218,7 +218,7 @@ mod map_reduce { let mut ref_count = 0; let mut is_done = false; - fn get<V: copy send>(p: Port<reduce_proto<V>>, + fn get<V: Copy Send>(p: Port<reduce_proto<V>>, &ref_count: int, &is_done: bool) -> Option<V> { while !is_done || ref_count > 0 { @@ -241,7 +241,7 @@ mod map_reduce { reduce(key, || get(p, ref_count, is_done) ); } - fn map_reduce<K1: copy send, K2: const copy send hash_key, V: copy send>( + fn map_reduce<K1: Copy Send, K2: Const Copy Send hash_key, V: Copy Send>( map: mapper<K1, K2, V>, reduce: reducer<K2, V>, inputs: ~[K1]) diff --git a/src/test/compile-fail/bad-method-typaram-kind.rs b/src/test/compile-fail/bad-method-typaram-kind.rs index 1da4ec8a626..8983d42a90b 100644 --- a/src/test/compile-fail/bad-method-typaram-kind.rs +++ b/src/test/compile-fail/bad-method-typaram-kind.rs @@ -3,11 +3,11 @@ fn foo<T>() { } trait bar { - fn bar<T:copy>(); + fn bar<T:Copy>(); } impl uint: bar { - fn bar<T:copy>() { + fn bar<T:Copy>() { } } diff --git a/src/test/compile-fail/fn-variance-2.rs b/src/test/compile-fail/fn-variance-2.rs index 6d9bdabae86..487860c01b1 100644 --- a/src/test/compile-fail/fn-variance-2.rs +++ b/src/test/compile-fail/fn-variance-2.rs @@ -1,4 +1,4 @@ -fn reproduce<T:copy>(t: T) -> fn@() -> T { +fn reproduce<T:Copy>(t: T) -> fn@() -> T { fn@() -> T { t } } diff --git a/src/test/compile-fail/fn-variance-3.rs b/src/test/compile-fail/fn-variance-3.rs index f9fe3d31fcc..576a9ba7675 100644 --- a/src/test/compile-fail/fn-variance-3.rs +++ b/src/test/compile-fail/fn-variance-3.rs @@ -1,4 +1,4 @@ -fn mk_identity<T:copy>() -> fn@(T) -> T { +fn mk_identity<T:Copy>() -> fn@(T) -> T { fn@(t: T) -> T { t } } diff --git a/src/test/compile-fail/infinite-instantiation.rs b/src/test/compile-fail/infinite-instantiation.rs index 090bb5e4f48..682b856afd0 100644 --- a/src/test/compile-fail/infinite-instantiation.rs +++ b/src/test/compile-fail/infinite-instantiation.rs @@ -11,7 +11,7 @@ impl uint: to_opt { } } -impl<T:copy> Option<T>: to_opt { +impl<T:Copy> Option<T>: to_opt { fn to_option() -> Option<Option<T>> { Some(self) } diff --git a/src/test/compile-fail/issue-2587-2.rs b/src/test/compile-fail/issue-2587-2.rs index db8d8f9fb7b..36cf99b321c 100644 --- a/src/test/compile-fail/issue-2587-2.rs +++ b/src/test/compile-fail/issue-2587-2.rs @@ -1,4 +1,4 @@ -fn foo<T: copy>(+_t: T) { fail; } +fn foo<T: Copy>(+_t: T) { fail; } fn bar<T>(+_t: T) { fail; } diff --git a/src/test/compile-fail/issue-2611-3.rs b/src/test/compile-fail/issue-2611-3.rs index 9a042fd1d0b..5545c0b2a13 100644 --- a/src/test/compile-fail/issue-2611-3.rs +++ b/src/test/compile-fail/issue-2611-3.rs @@ -7,7 +7,7 @@ import iter; import iter::BaseIter; trait A { - fn b<C:copy const, D>(x: C) -> C; + fn b<C:Copy Const, D>(x: C) -> C; } struct E { @@ -15,7 +15,7 @@ struct E { } impl E: A { - fn b<F:copy, G>(_x: F) -> F { fail } //~ ERROR in method `b`, type parameter 0 has 1 bound, but + fn b<F:Copy, G>(_x: F) -> F { fail } //~ ERROR in method `b`, type parameter 0 has 1 bound, but } fn main() {} \ No newline at end of file diff --git a/src/test/compile-fail/issue-2611-4.rs b/src/test/compile-fail/issue-2611-4.rs index 977cce73808..22674c06595 100644 --- a/src/test/compile-fail/issue-2611-4.rs +++ b/src/test/compile-fail/issue-2611-4.rs @@ -4,7 +4,7 @@ import iter; import iter::BaseIter; trait A { - fn b<C:copy, D>(x: C) -> C; + fn b<C:Copy, D>(x: C) -> C; } struct E { @@ -12,7 +12,7 @@ struct E { } impl E: A { - fn b<F:copy const, G>(_x: F) -> F { fail } //~ ERROR in method `b`, type parameter 0 has 2 bounds, but + fn b<F:Copy Const, G>(_x: F) -> F { fail } //~ ERROR in method `b`, type parameter 0 has 2 bounds, but } fn main() {} \ No newline at end of file diff --git a/src/test/compile-fail/issue-2611-5.rs b/src/test/compile-fail/issue-2611-5.rs index 99afe776f86..b01342282b2 100644 --- a/src/test/compile-fail/issue-2611-5.rs +++ b/src/test/compile-fail/issue-2611-5.rs @@ -4,7 +4,7 @@ import iter; import iter::BaseIter; trait A { - fn b<C:copy, D>(x: C) -> C; + fn b<C:Copy, D>(x: C) -> C; } struct E { @@ -13,7 +13,7 @@ struct E { impl E: A { // n.b. The error message is awful -- see #3404 - fn b<F:copy, G>(_x: G) -> G { fail } //~ ERROR method `b` has an incompatible type + fn b<F:Copy, G>(_x: G) -> G { fail } //~ ERROR method `b` has an incompatible type } fn main() {} \ No newline at end of file diff --git a/src/test/compile-fail/issue-2718-a.rs b/src/test/compile-fail/issue-2718-a.rs index 0feaa9b857e..b857af4e2f3 100644 --- a/src/test/compile-fail/issue-2718-a.rs +++ b/src/test/compile-fail/issue-2718-a.rs @@ -1,4 +1,4 @@ -struct send_packet<T: copy> { +struct send_packet<T: Copy> { p: T } diff --git a/src/test/compile-fail/issue-2766-a.rs b/src/test/compile-fail/issue-2766-a.rs index f2c6ded88d5..78225ba15ec 100644 --- a/src/test/compile-fail/issue-2766-a.rs +++ b/src/test/compile-fail/issue-2766-a.rs @@ -1,7 +1,7 @@ mod stream { - enum stream<T: send> { send(T, server::stream<T>), } + enum stream<T: Send> { send(T, server::stream<T>), } mod server { - impl<T: send> stream<T> { + impl<T: Send> stream<T> { fn recv() -> extern fn(+stream<T>) -> stream::stream<T> { // resolve really should report just one error here. // Change the test case when it changes. @@ -14,7 +14,7 @@ mod stream { recv } } - type stream<T: send> = pipes::RecvPacket<stream::stream<T>>; + type stream<T: Send> = pipes::RecvPacket<stream::stream<T>>; } } diff --git a/src/test/compile-fail/kindck-owned-trait-contains.rs b/src/test/compile-fail/kindck-owned-trait-contains.rs index 5d12ab9d517..c916bcba7c8 100644 --- a/src/test/compile-fail/kindck-owned-trait-contains.rs +++ b/src/test/compile-fail/kindck-owned-trait-contains.rs @@ -1,10 +1,10 @@ trait repeat<A> { fn get() -> A; } -impl<A:copy> @A: repeat<A> { +impl<A:Copy> @A: repeat<A> { fn get() -> A { *self } } -fn repeater<A:copy>(v: @A) -> repeat<A> { +fn repeater<A:Copy>(v: @A) -> repeat<A> { // Note: owned kind is not necessary as A appears in the trait type v as repeat::<A> // No } diff --git a/src/test/compile-fail/kindck-owned-trait-scoped.rs b/src/test/compile-fail/kindck-owned-trait-scoped.rs index 80a0e3bc0d5..5b39d3e4651 100644 --- a/src/test/compile-fail/kindck-owned-trait-scoped.rs +++ b/src/test/compile-fail/kindck-owned-trait-scoped.rs @@ -5,11 +5,11 @@ trait foo { fn foo(i: &self/int) -> int; } -impl<T:copy> T: foo { +impl<T:Copy> T: foo { fn foo(i: &self/int) -> int {*i} } -fn to_foo<T:copy>(t: T) { +fn to_foo<T:Copy>(t: T) { // This version is ok because, although T may contain borrowed // pointers, it never escapes the fn body. We know this because // the type of foo includes a region which will be resolved to @@ -19,13 +19,13 @@ fn to_foo<T:copy>(t: T) { assert x.foo(v) == 3; } -fn to_foo_2<T:copy>(t: T) -> foo { +fn to_foo_2<T:Copy>(t: T) -> foo { // Not OK---T may contain borrowed ptrs and it is going to escape // as part of the returned foo value {f:t} as foo //~ ERROR value may contain borrowed pointers; use `owned` bound } -fn to_foo_3<T:copy owned>(t: T) -> foo { +fn to_foo_3<T:Copy Owned>(t: T) -> foo { // OK---T may escape as part of the returned foo value, but it is // owned and hence does not contain borrowed ptrs {f:t} as foo diff --git a/src/test/compile-fail/kindck-owned-trait.rs b/src/test/compile-fail/kindck-owned-trait.rs index 35009847c73..ea57fe5a6cf 100644 --- a/src/test/compile-fail/kindck-owned-trait.rs +++ b/src/test/compile-fail/kindck-owned-trait.rs @@ -1,10 +1,10 @@ trait foo { fn foo(); } -fn to_foo<T: copy foo>(t: T) -> foo { +fn to_foo<T: Copy foo>(t: T) -> foo { t as foo //~ ERROR value may contain borrowed pointers; use `owned` bound } -fn to_foo2<T: copy foo owned>(t: T) -> foo { +fn to_foo2<T: Copy foo Owned>(t: T) -> foo { t as foo } diff --git a/src/test/compile-fail/kindck-owned.rs b/src/test/compile-fail/kindck-owned.rs index e689292c45e..3e6a2f2946d 100644 --- a/src/test/compile-fail/kindck-owned.rs +++ b/src/test/compile-fail/kindck-owned.rs @@ -1,8 +1,8 @@ -fn copy1<T: copy>(t: T) -> fn@() -> T { +fn copy1<T: Copy>(t: T) -> fn@() -> T { fn@() -> T { t } //~ ERROR value may contain borrowed pointers } -fn copy2<T: copy owned>(t: T) -> fn@() -> T { +fn copy2<T: Copy Owned>(t: T) -> fn@() -> T { fn@() -> T { t } } diff --git a/src/test/compile-fail/liveness-use-after-send.rs b/src/test/compile-fail/liveness-use-after-send.rs index 6dfa9a997ff..5447c88e567 100644 --- a/src/test/compile-fail/liveness-use-after-send.rs +++ b/src/test/compile-fail/liveness-use-after-send.rs @@ -1,4 +1,4 @@ -fn send<T: send>(ch: _chan<T>, -data: T) { +fn send<T: Send>(ch: _chan<T>, -data: T) { log(debug, ch); log(debug, data); fail; diff --git a/src/test/compile-fail/non-const.rs b/src/test/compile-fail/non-const.rs index 37ba5830b10..d2cf08fc847 100644 --- a/src/test/compile-fail/non-const.rs +++ b/src/test/compile-fail/non-const.rs @@ -1,6 +1,6 @@ // Test that various non const things are rejected. -fn foo<T: const>(_x: T) { } +fn foo<T: Const>(_x: T) { } struct r { x:int, diff --git a/src/test/compile-fail/tag-that-dare-not-speak-its-name.rs b/src/test/compile-fail/tag-that-dare-not-speak-its-name.rs index 39eb825b80b..bd65fa41fd5 100644 --- a/src/test/compile-fail/tag-that-dare-not-speak-its-name.rs +++ b/src/test/compile-fail/tag-that-dare-not-speak-its-name.rs @@ -5,7 +5,7 @@ use core; -fn last<T: copy>(v: ~[const T]) -> core::Option<T> { +fn last<T: Copy>(v: ~[const T]) -> core::Option<T> { fail; } diff --git a/src/test/compile-fail/tps-invariant-trait.rs b/src/test/compile-fail/tps-invariant-trait.rs index 88039f234b5..b1525229658 100644 --- a/src/test/compile-fail/tps-invariant-trait.rs +++ b/src/test/compile-fail/tps-invariant-trait.rs @@ -7,7 +7,7 @@ enum box_impl<T> = { mut f: T }; -impl<T:copy> box_impl<T>: box_trait<T> { +impl<T:Copy> box_impl<T>: box_trait<T> { fn get() -> T { return self.f; } fn set(t: T) { self.f = t; } } diff --git a/src/test/compile-fail/unique-unique-kind.rs b/src/test/compile-fail/unique-unique-kind.rs index afa8134e083..eea832c91a4 100644 --- a/src/test/compile-fail/unique-unique-kind.rs +++ b/src/test/compile-fail/unique-unique-kind.rs @@ -1,4 +1,4 @@ -fn f<T: send>(_i: T) { +fn f<T: Send>(_i: T) { } fn main() { diff --git a/src/test/compile-fail/vec-concat-bug.rs b/src/test/compile-fail/vec-concat-bug.rs index afbb57f5878..c21e337af60 100644 --- a/src/test/compile-fail/vec-concat-bug.rs +++ b/src/test/compile-fail/vec-concat-bug.rs @@ -1,4 +1,4 @@ -fn concat<T: copy>(v: ~[const ~[const T]]) -> ~[T] { +fn concat<T: Copy>(v: ~[const ~[const T]]) -> ~[T] { let mut r = ~[]; // Earlier versions of our type checker accepted this: diff --git a/src/test/run-fail/bug-811.rs b/src/test/run-fail/bug-811.rs index e376085772b..a6575143765 100644 --- a/src/test/run-fail/bug-811.rs +++ b/src/test/run-fail/bug-811.rs @@ -4,8 +4,8 @@ fn test00_start(ch: chan_t<int>, message: int) { send(ch, message); } type task_id = int; type port_id = int; -enum chan_t<T: send> = {task: task_id, port: port_id}; +enum chan_t<T: Send> = {task: task_id, port: port_id}; -fn send<T: send>(ch: chan_t<T>, data: T) { fail; } +fn send<T: Send>(ch: chan_t<T>, data: T) { fail; } fn main() { fail ~"quux"; } diff --git a/src/test/run-fail/issue-2444.rs b/src/test/run-fail/issue-2444.rs index ed8bd9173b5..20620ac62e8 100644 --- a/src/test/run-fail/issue-2444.rs +++ b/src/test/run-fail/issue-2444.rs @@ -3,7 +3,7 @@ use std; use std::arc; -enum e<T: const send> { e(arc::ARC<T>) } +enum e<T: Const Send> { e(arc::ARC<T>) } fn foo() -> e<int> {fail;} diff --git a/src/test/run-fail/port-type.rs b/src/test/run-fail/port-type.rs index 40d3067d4df..44ce6e524ca 100644 --- a/src/test/run-fail/port-type.rs +++ b/src/test/run-fail/port-type.rs @@ -5,7 +5,7 @@ use comm::Port; use comm::send; use comm::recv; -fn echo<T: send>(c: Chan<T>, oc: Chan<Chan<T>>) { +fn echo<T: Send>(c: Chan<T>, oc: Chan<Chan<T>>) { // Tests that the type argument in port gets // visited let p = Port::<T>(); diff --git a/src/test/run-pass/alignment-gep-tup-like-1.rs b/src/test/run-pass/alignment-gep-tup-like-1.rs index 410bc9b570b..23cc80233fe 100644 --- a/src/test/run-pass/alignment-gep-tup-like-1.rs +++ b/src/test/run-pass/alignment-gep-tup-like-1.rs @@ -2,7 +2,7 @@ type pair<A,B> = { a: A, b: B }; -fn f<A:copy owned>(a: A, b: u16) -> fn@() -> (A, u16) { +fn f<A:Copy Owned>(a: A, b: u16) -> fn@() -> (A, u16) { fn@() -> (A, u16) { (a, b) } } diff --git a/src/test/run-pass/alignment-gep-tup-like-2.rs b/src/test/run-pass/alignment-gep-tup-like-2.rs index dda856efb37..098c82b18d4 100644 --- a/src/test/run-pass/alignment-gep-tup-like-2.rs +++ b/src/test/run-pass/alignment-gep-tup-like-2.rs @@ -8,12 +8,12 @@ type _rec<A> = { mut rec: Option<@rec<A>> }; -fn make_cycle<A:copy>(a: A) { +fn make_cycle<A:Copy>(a: A) { let g: @rec<A> = @rec({val: a, mut rec: None}); g.rec = Some(g); } -fn f<A:send copy, B:send copy>(a: A, b: B) -> fn@() -> (A, B) { +fn f<A:Send Copy, B:Send Copy>(a: A, b: B) -> fn@() -> (A, B) { fn@() -> (A, B) { (a, b) } } diff --git a/src/test/run-pass/auto-instantiate.rs b/src/test/run-pass/auto-instantiate.rs index 522ead87c73..941a20f85e0 100644 --- a/src/test/run-pass/auto-instantiate.rs +++ b/src/test/run-pass/auto-instantiate.rs @@ -2,7 +2,7 @@ // -*- rust -*- -fn f<T: copy, U: copy>(x: T, y: U) -> {a: T, b: U} { return {a: x, b: y}; } +fn f<T: Copy, U: Copy>(x: T, y: U) -> {a: T, b: U} { return {a: x, b: y}; } fn main() { log(debug, f({x: 3, y: 4, z: 5}, 4).a.x); diff --git a/src/test/run-pass/autobind.rs b/src/test/run-pass/autobind.rs index ad3b1366fca..70e513a879d 100644 --- a/src/test/run-pass/autobind.rs +++ b/src/test/run-pass/autobind.rs @@ -1,4 +1,4 @@ -fn f<T: copy>(x: ~[T]) -> T { return x[0]; } +fn f<T: Copy>(x: ~[T]) -> T { return x[0]; } fn g(act: fn(~[int]) -> int) -> int { return act(~[1, 2, 3]); } diff --git a/src/test/run-pass/bounded-fn-type.rs b/src/test/run-pass/bounded-fn-type.rs index b21050f4d43..09f05d86d07 100644 --- a/src/test/run-pass/bounded-fn-type.rs +++ b/src/test/run-pass/bounded-fn-type.rs @@ -1,7 +1,7 @@ fn ignore<T>(_x: T) {} fn main() { - let f: fn@:send() = ||(); + let f: fn@:Send() = ||(); ignore(f); } diff --git a/src/test/run-pass/box-unbox.rs b/src/test/run-pass/box-unbox.rs index e189066c09f..27cb9846b3d 100644 --- a/src/test/run-pass/box-unbox.rs +++ b/src/test/run-pass/box-unbox.rs @@ -1,8 +1,8 @@ -type box<T: copy> = {c: @T}; +type box<T: Copy> = {c: @T}; -fn unbox<T: copy>(b: box<T>) -> T { return *b.c; } +fn unbox<T: Copy>(b: box<T>) -> T { return *b.c; } fn main() { let foo: int = 17; 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 316d98cd84a..665ee3cfe25 100644 --- a/src/test/run-pass/class-impl-very-parameterized-trait.rs +++ b/src/test/run-pass/class-impl-very-parameterized-trait.rs @@ -14,7 +14,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> : map<int, T> { +struct cat<T: Copy> : map<int, T> { priv { // Yes, you can have negative meows mut meows : int, @@ -94,7 +94,7 @@ struct cat<T: copy> : map<int, T> { fn clear() { } } -fn cat<T: copy>(in_x : int, in_y : int, in_name: T) -> cat<T> { +fn cat<T: Copy>(in_x : int, in_y : int, in_name: T) -> cat<T> { cat { meows: in_x, how_hungry: in_y, diff --git a/src/test/run-pass/class-trait-bounded-param.rs b/src/test/run-pass/class-trait-bounded-param.rs index 91b3f68d5b2..2ffd41229a5 100644 --- a/src/test/run-pass/class-trait-bounded-param.rs +++ b/src/test/run-pass/class-trait-bounded-param.rs @@ -3,7 +3,7 @@ use std; use std::map::{map, hashmap, int_hash}; -class keys<K: copy, V: copy, M: copy map<K,V>> +class keys<K: Copy, V: Copy, M: Copy map<K,V>> : iter::base_iter<K> { let map: M; diff --git a/src/test/run-pass/close-over-big-then-small-data.rs b/src/test/run-pass/close-over-big-then-small-data.rs index ed0388b2bce..83f92e7a72d 100644 --- a/src/test/run-pass/close-over-big-then-small-data.rs +++ b/src/test/run-pass/close-over-big-then-small-data.rs @@ -6,7 +6,7 @@ type pair<A,B> = { a: A, b: B }; -fn f<A:copy owned>(a: A, b: u16) -> fn@() -> (A, u16) { +fn f<A:Copy Owned>(a: A, b: u16) -> fn@() -> (A, u16) { fn@() -> (A, u16) { (a, b) } } diff --git a/src/test/run-pass/const-bound.rs b/src/test/run-pass/const-bound.rs index e5e60f184f2..9d0d33524ef 100644 --- a/src/test/run-pass/const-bound.rs +++ b/src/test/run-pass/const-bound.rs @@ -2,7 +2,7 @@ // are const. -fn foo<T: copy const>(x: T) -> T { x } +fn foo<T: Copy Const>(x: T) -> T { x } fn main() { foo(1); diff --git a/src/test/run-pass/expr-alt-generic-box2.rs b/src/test/run-pass/expr-alt-generic-box2.rs index ad3436c2b8f..ef0b2c2078d 100644 --- a/src/test/run-pass/expr-alt-generic-box2.rs +++ b/src/test/run-pass/expr-alt-generic-box2.rs @@ -4,7 +4,7 @@ // -*- rust -*- type compare<T> = fn@(T, T) -> bool; -fn test_generic<T: copy>(expected: T, eq: compare<T>) { +fn test_generic<T: Copy>(expected: T, eq: compare<T>) { let actual: T = match true { true => { expected }, _ => fail ~"wat" }; assert (eq(expected, actual)); } diff --git a/src/test/run-pass/expr-alt-generic-unique1.rs b/src/test/run-pass/expr-alt-generic-unique1.rs index a227931180f..264f03ee2c3 100644 --- a/src/test/run-pass/expr-alt-generic-unique1.rs +++ b/src/test/run-pass/expr-alt-generic-unique1.rs @@ -3,7 +3,7 @@ // -*- rust -*- type compare<T> = fn@(~T, ~T) -> bool; -fn test_generic<T: copy>(expected: ~T, eq: compare<T>) { +fn test_generic<T: Copy>(expected: ~T, eq: compare<T>) { let actual: ~T = match true { true => { expected }, _ => fail ~"wat" }; assert (eq(expected, actual)); } diff --git a/src/test/run-pass/expr-alt-generic-unique2.rs b/src/test/run-pass/expr-alt-generic-unique2.rs index d92cde5d82a..e5c8d2acd87 100644 --- a/src/test/run-pass/expr-alt-generic-unique2.rs +++ b/src/test/run-pass/expr-alt-generic-unique2.rs @@ -4,7 +4,7 @@ // -*- rust -*- type compare<T> = fn@(T, T) -> bool; -fn test_generic<T: copy>(expected: T, eq: compare<T>) { +fn test_generic<T: Copy>(expected: T, eq: compare<T>) { let actual: T = match true { true => expected, _ => fail ~"wat" }; assert (eq(expected, actual)); } diff --git a/src/test/run-pass/expr-alt-generic.rs b/src/test/run-pass/expr-alt-generic.rs index 0d1f5e2bbe8..d17d7db9038 100644 --- a/src/test/run-pass/expr-alt-generic.rs +++ b/src/test/run-pass/expr-alt-generic.rs @@ -4,7 +4,7 @@ // -*- rust -*- type compare<T> = fn@(T, T) -> bool; -fn test_generic<T: copy>(expected: T, eq: compare<T>) { +fn test_generic<T: Copy>(expected: T, eq: compare<T>) { let actual: T = match true { true => { expected }, _ => fail ~"wat" }; assert (eq(expected, actual)); } diff --git a/src/test/run-pass/expr-block-generic-box2.rs b/src/test/run-pass/expr-block-generic-box2.rs index 7935cec7f5d..8fc566d5843 100644 --- a/src/test/run-pass/expr-block-generic-box2.rs +++ b/src/test/run-pass/expr-block-generic-box2.rs @@ -4,7 +4,7 @@ // -*- rust -*- type compare<T> = fn@(T, T) -> bool; -fn test_generic<T: copy>(expected: T, eq: compare<T>) { +fn test_generic<T: Copy>(expected: T, eq: compare<T>) { let actual: T = { expected }; assert (eq(expected, actual)); } diff --git a/src/test/run-pass/expr-block-generic-unique1.rs b/src/test/run-pass/expr-block-generic-unique1.rs index df94544acd1..0ccabb2c081 100644 --- a/src/test/run-pass/expr-block-generic-unique1.rs +++ b/src/test/run-pass/expr-block-generic-unique1.rs @@ -3,7 +3,7 @@ // -*- rust -*- type compare<T> = fn@(~T, ~T) -> bool; -fn test_generic<T: copy>(expected: ~T, eq: compare<T>) { +fn test_generic<T: Copy>(expected: ~T, eq: compare<T>) { let actual: ~T = { expected }; assert (eq(expected, actual)); } diff --git a/src/test/run-pass/expr-block-generic-unique2.rs b/src/test/run-pass/expr-block-generic-unique2.rs index 51bb0274e7f..cda0148cfe8 100644 --- a/src/test/run-pass/expr-block-generic-unique2.rs +++ b/src/test/run-pass/expr-block-generic-unique2.rs @@ -4,7 +4,7 @@ // -*- rust -*- type compare<T> = fn@(T, T) -> bool; -fn test_generic<T: copy>(expected: T, eq: compare<T>) { +fn test_generic<T: Copy>(expected: T, eq: compare<T>) { let actual: T = { expected }; assert (eq(expected, actual)); } diff --git a/src/test/run-pass/expr-block-generic.rs b/src/test/run-pass/expr-block-generic.rs index 71e6f962e35..adb49f3142d 100644 --- a/src/test/run-pass/expr-block-generic.rs +++ b/src/test/run-pass/expr-block-generic.rs @@ -6,7 +6,7 @@ // Tests for standalone blocks as expressions with dynamic type sizes type compare<T> = fn@(T, T) -> bool; -fn test_generic<T: copy>(expected: T, eq: compare<T>) { +fn test_generic<T: Copy>(expected: T, eq: compare<T>) { let actual: T = { expected }; assert (eq(expected, actual)); } diff --git a/src/test/run-pass/expr-fn.rs b/src/test/run-pass/expr-fn.rs index f181b3f3261..c2d27cf696c 100644 --- a/src/test/run-pass/expr-fn.rs +++ b/src/test/run-pass/expr-fn.rs @@ -9,7 +9,7 @@ fn test_vec() { } fn test_generic() { - fn f<T: copy>(t: T) -> T { t } + fn f<T: Copy>(t: T) -> T { t } assert (f(10) == 10); } diff --git a/src/test/run-pass/expr-if-generic-box2.rs b/src/test/run-pass/expr-if-generic-box2.rs index ef56bcd41dc..e5370db83d1 100644 --- a/src/test/run-pass/expr-if-generic-box2.rs +++ b/src/test/run-pass/expr-if-generic-box2.rs @@ -4,7 +4,7 @@ // -*- rust -*- type compare<T> = fn@(T, T) -> bool; -fn test_generic<T: copy>(expected: T, not_expected: T, eq: compare<T>) { +fn test_generic<T: Copy>(expected: T, not_expected: T, eq: compare<T>) { let actual: T = if true { expected } else { not_expected }; assert (eq(expected, actual)); } diff --git a/src/test/run-pass/expr-if-generic.rs b/src/test/run-pass/expr-if-generic.rs index 1ad0b006592..5d7730809d5 100644 --- a/src/test/run-pass/expr-if-generic.rs +++ b/src/test/run-pass/expr-if-generic.rs @@ -6,7 +6,7 @@ // Tests for if as expressions with dynamic type sizes type compare<T> = fn@(T, T) -> bool; -fn test_generic<T: copy>(expected: T, not_expected: T, eq: compare<T>) { +fn test_generic<T: Copy>(expected: T, not_expected: T, eq: compare<T>) { let actual: T = if true { expected } else { not_expected }; assert (eq(expected, actual)); } diff --git a/src/test/run-pass/fixed-point-bind-unique.rs b/src/test/run-pass/fixed-point-bind-unique.rs index 95ebd437b88..2c7ef7fb125 100644 --- a/src/test/run-pass/fixed-point-bind-unique.rs +++ b/src/test/run-pass/fixed-point-bind-unique.rs @@ -1,8 +1,8 @@ -fn fix_help<A: owned, B: send>(f: extern fn(fn@(A) -> B, A) -> B, x: A) -> B { +fn fix_help<A: Owned, B: Send>(f: extern fn(fn@(A) -> B, A) -> B, x: A) -> B { return f({|a|fix_help(f, a)}, x); } -fn fix<A: owned, B: send>(f: extern fn(fn@(A) -> B, A) -> B) -> fn@(A) -> B { +fn fix<A: Owned, B: Send>(f: extern fn(fn@(A) -> B, A) -> B) -> fn@(A) -> B { return {|a|fix_help(f, a)}; } diff --git a/src/test/run-pass/fn-bare-spawn.rs b/src/test/run-pass/fn-bare-spawn.rs index 4ad9b5090cc..cc57ba6a9af 100644 --- a/src/test/run-pass/fn-bare-spawn.rs +++ b/src/test/run-pass/fn-bare-spawn.rs @@ -1,6 +1,6 @@ // This is what the signature to spawn should look like with bare functions -fn spawn<T: send>(val: T, f: extern fn(T)) { +fn spawn<T: Send>(val: T, f: extern fn(T)) { f(val); } diff --git a/src/test/run-pass/generic-alias-box.rs b/src/test/run-pass/generic-alias-box.rs index c273672f781..f140ad1b994 100644 --- a/src/test/run-pass/generic-alias-box.rs +++ b/src/test/run-pass/generic-alias-box.rs @@ -1,6 +1,6 @@ -fn id<T: copy>(t: T) -> T { return t; } +fn id<T: Copy>(t: T) -> T { return t; } fn main() { let expected = @100; diff --git a/src/test/run-pass/generic-alias-unique.rs b/src/test/run-pass/generic-alias-unique.rs index 79285589766..9d3ac09de7c 100644 --- a/src/test/run-pass/generic-alias-unique.rs +++ b/src/test/run-pass/generic-alias-unique.rs @@ -1,6 +1,6 @@ -fn id<T: copy send>(t: T) -> T { return t; } +fn id<T: Copy Send>(t: T) -> T { return t; } fn main() { let expected = ~100; diff --git a/src/test/run-pass/generic-box.rs b/src/test/run-pass/generic-box.rs index 3d871c896a8..fed97b99f8e 100644 --- a/src/test/run-pass/generic-box.rs +++ b/src/test/run-pass/generic-box.rs @@ -1,6 +1,6 @@ -fn box<T: copy>(x: {x: T, y: T, z: T}) -> @{x: T, y: T, z: T} { return @x; } +fn box<T: Copy>(x: {x: T, y: T, z: T}) -> @{x: T, y: T, z: T} { return @x; } fn main() { let x: @{x: int, y: int, z: int} = box::<int>({x: 1, y: 2, z: 3}); diff --git a/src/test/run-pass/generic-derived-type.rs b/src/test/run-pass/generic-derived-type.rs index cb406e85980..f190e72b648 100644 --- a/src/test/run-pass/generic-derived-type.rs +++ b/src/test/run-pass/generic-derived-type.rs @@ -1,8 +1,8 @@ -fn g<X: copy>(x: X) -> X { return x; } +fn g<X: Copy>(x: X) -> X { return x; } -fn f<T: copy>(t: T) -> {a: T, b: T} { +fn f<T: Copy>(t: T) -> {a: T, b: T} { type pair = {a: T, b: T}; let x: pair = {a: t, b: t}; diff --git a/src/test/run-pass/generic-drop-glue.rs b/src/test/run-pass/generic-drop-glue.rs index 15583f9904b..c6d16a4127c 100644 --- a/src/test/run-pass/generic-drop-glue.rs +++ b/src/test/run-pass/generic-drop-glue.rs @@ -1,5 +1,5 @@ -fn f<T: copy>(t: T) { let t1: T = t; } +fn f<T: Copy>(t: T) { let t1: T = t; } fn main() { let x = {x: @10, y: @12}; f(x); } diff --git a/src/test/run-pass/generic-exterior-box.rs b/src/test/run-pass/generic-exterior-box.rs index c683da09bdf..ff2221aeefb 100644 --- a/src/test/run-pass/generic-exterior-box.rs +++ b/src/test/run-pass/generic-exterior-box.rs @@ -1,8 +1,8 @@ -type recbox<T: copy> = {x: @T}; +type recbox<T: Copy> = {x: @T}; -fn reclift<T: copy>(t: T) -> recbox<T> { return {x: @t}; } +fn reclift<T: Copy>(t: T) -> recbox<T> { return {x: @t}; } fn main() { let foo: int = 17; diff --git a/src/test/run-pass/generic-exterior-unique.rs b/src/test/run-pass/generic-exterior-unique.rs index 227bb7066c4..61860d36b5e 100644 --- a/src/test/run-pass/generic-exterior-unique.rs +++ b/src/test/run-pass/generic-exterior-unique.rs @@ -1,6 +1,6 @@ -type recbox<T: copy> = {x: ~T}; +type recbox<T: Copy> = {x: ~T}; -fn reclift<T: copy>(t: T) -> recbox<T> { return {x: ~t}; } +fn reclift<T: Copy>(t: T) -> recbox<T> { return {x: ~t}; } fn main() { let foo: int = 17; diff --git a/src/test/run-pass/generic-fn-infer.rs b/src/test/run-pass/generic-fn-infer.rs index b375752d1a1..c7696259ec2 100644 --- a/src/test/run-pass/generic-fn-infer.rs +++ b/src/test/run-pass/generic-fn-infer.rs @@ -4,6 +4,6 @@ // -*- rust -*- // Issue #45: infer type parameters in function applications -fn id<T: copy>(x: T) -> T { return x; } +fn id<T: Copy>(x: T) -> T { return x; } fn main() { let x: int = 42; let y: int = id(x); assert (x == y); } diff --git a/src/test/run-pass/generic-fn-unique.rs b/src/test/run-pass/generic-fn-unique.rs index 7d54afd59eb..81fbd307d2a 100644 --- a/src/test/run-pass/generic-fn-unique.rs +++ b/src/test/run-pass/generic-fn-unique.rs @@ -1,4 +1,4 @@ -fn f<T: copy>(x: ~T) -> ~T { return x; } +fn f<T: Copy>(x: ~T) -> ~T { return x; } fn main() { let x = f(~3); log(debug, *x); } diff --git a/src/test/run-pass/generic-fn.rs b/src/test/run-pass/generic-fn.rs index fae711ae3ad..c7a38940caf 100644 --- a/src/test/run-pass/generic-fn.rs +++ b/src/test/run-pass/generic-fn.rs @@ -2,7 +2,7 @@ // -*- rust -*- -fn id<T: copy>(x: T) -> T { return x; } +fn id<T: Copy>(x: T) -> T { return x; } type triple = {x: int, y: int, z: int}; diff --git a/src/test/run-pass/generic-tup.rs b/src/test/run-pass/generic-tup.rs index b660592720c..1d37565be31 100644 --- a/src/test/run-pass/generic-tup.rs +++ b/src/test/run-pass/generic-tup.rs @@ -1,4 +1,4 @@ -fn get_third<T: copy>(t: (T, T, T)) -> T { let (_, _, x) = t; return x; } +fn get_third<T: Copy>(t: (T, T, T)) -> T { let (_, _, x) = t; return x; } fn main() { log(debug, get_third((1, 2, 3))); diff --git a/src/test/run-pass/generic-unique.rs b/src/test/run-pass/generic-unique.rs index 0572257a877..21daeac2ef7 100644 --- a/src/test/run-pass/generic-unique.rs +++ b/src/test/run-pass/generic-unique.rs @@ -1,5 +1,5 @@ -fn box<T: copy>(x: {x: T, y: T, z: T}) -> ~{x: T, y: T, z: T} { return ~x; } +fn box<T: Copy>(x: {x: T, y: T, z: T}) -> ~{x: T, y: T, z: T} { return ~x; } fn main() { let x: ~{x: int, y: int, z: int} = box::<int>({x: 1, y: 2, z: 3}); diff --git a/src/test/run-pass/issue-2288.rs b/src/test/run-pass/issue-2288.rs index a01b55f50c6..f4d045bb444 100644 --- a/src/test/run-pass/issue-2288.rs +++ b/src/test/run-pass/issue-2288.rs @@ -1,19 +1,19 @@ -trait clam<A: copy> { +trait clam<A: Copy> { fn chowder(y: A); } -struct foo<A: copy> : clam<A> { +struct foo<A: Copy> : clam<A> { x: A, fn chowder(y: A) { } } -fn foo<A: copy>(b: A) -> foo<A> { +fn foo<A: Copy>(b: A) -> foo<A> { foo { x: b } } -fn f<A: copy>(x: clam<A>, a: A) { +fn f<A: Copy>(x: clam<A>, a: A) { x.chowder(a); } diff --git a/src/test/run-pass/issue-2311-2.rs b/src/test/run-pass/issue-2311-2.rs index 20c9b9ad947..ef3752d5fa7 100644 --- a/src/test/run-pass/issue-2311-2.rs +++ b/src/test/run-pass/issue-2311-2.rs @@ -1,12 +1,12 @@ -trait clam<A: copy> { } -struct foo<A: copy> { +trait clam<A: Copy> { } +struct foo<A: Copy> { x: A, fn bar<B,C:clam<A>>(c: C) -> B { fail; } } -fn foo<A: copy>(b: A) -> foo<A> { +fn foo<A: Copy>(b: A) -> foo<A> { foo { x: b } diff --git a/src/test/run-pass/issue-2445-b.rs b/src/test/run-pass/issue-2445-b.rs index 2318691aebe..0b650286020 100644 --- a/src/test/run-pass/issue-2445-b.rs +++ b/src/test/run-pass/issue-2445-b.rs @@ -1,16 +1,16 @@ -struct c1<T: copy> { +struct c1<T: Copy> { x: T, fn f1(x: int) { } } -fn c1<T: copy>(x: T) -> c1<T> { +fn c1<T: Copy>(x: T) -> c1<T> { c1 { x: x } } -impl<T: copy> c1<T> { +impl<T: Copy> c1<T> { fn f2(x: int) { } } diff --git a/src/test/run-pass/issue-2445.rs b/src/test/run-pass/issue-2445.rs index edb0fdf16ae..ae6cdf34e4d 100644 --- a/src/test/run-pass/issue-2445.rs +++ b/src/test/run-pass/issue-2445.rs @@ -1,17 +1,17 @@ use dvec::DVec; -struct c1<T: copy> { +struct c1<T: Copy> { x: T, fn f1(x: T) {} } -fn c1<T: copy>(x: T) -> c1<T> { +fn c1<T: Copy>(x: T) -> c1<T> { c1 { x: x } } -impl<T: copy> c1<T> { +impl<T: Copy> c1<T> { fn f2(x: T) {} } diff --git a/src/test/run-pass/issue-2550.rs b/src/test/run-pass/issue-2550.rs index 989818ef594..496fe3a4798 100644 --- a/src/test/run-pass/issue-2550.rs +++ b/src/test/run-pass/issue-2550.rs @@ -8,7 +8,7 @@ fn C(x: uint) -> C { } } -fn f<T:copy>(_x: T) { +fn f<T:Copy>(_x: T) { } #[deny(non_implicitly_copyable_typarams)] diff --git a/src/test/run-pass/issue-2611.rs b/src/test/run-pass/issue-2611.rs index 94456ecb25b..0d5c244abcb 100644 --- a/src/test/run-pass/issue-2611.rs +++ b/src/test/run-pass/issue-2611.rs @@ -1,11 +1,11 @@ use iter::BaseIter; trait FlatMapToVec<A> { - fn flat_map_to_vec<B:copy, IB:BaseIter<B>>(op: fn(A) -> IB) -> ~[B]; + fn flat_map_to_vec<B:Copy, IB:BaseIter<B>>(op: fn(A) -> IB) -> ~[B]; } -impl<A:copy> BaseIter<A>: FlatMapToVec<A> { - fn flat_map_to_vec<B:copy, IB:BaseIter<B>>(op: fn(A) -> IB) -> ~[B] { +impl<A:Copy> BaseIter<A>: FlatMapToVec<A> { + fn flat_map_to_vec<B:Copy, IB:BaseIter<B>>(op: fn(A) -> IB) -> ~[B] { iter::flat_map_to_vec(self, op) } } diff --git a/src/test/run-pass/issue-2718.rs b/src/test/run-pass/issue-2718.rs index 856e8c2c174..d878d3fcf4b 100644 --- a/src/test/run-pass/issue-2718.rs +++ b/src/test/run-pass/issue-2718.rs @@ -15,13 +15,13 @@ mod pipes { pure fn ne(&&other: state) -> bool { !self.eq(other) } } - type packet<T: send> = { + type packet<T: Send> = { mut state: state, mut blocked_task: Option<task::Task>, mut payload: Option<T> }; - fn packet<T: send>() -> *packet<T> unsafe { + fn packet<T: Send>() -> *packet<T> unsafe { let p: *packet<T> = unsafe::transmute(~{ mut state: empty, mut blocked_task: None::<task::Task>, @@ -55,7 +55,7 @@ mod pipes { } } - fn send<T: send>(-p: send_packet<T>, -payload: T) { + fn send<T: Send>(-p: send_packet<T>, -payload: T) { let p = p.unwrap(); let p = unsafe { uniquify(p) }; assert (*p).payload.is_none(); @@ -81,7 +81,7 @@ mod pipes { } } - fn recv<T: send>(-p: recv_packet<T>) -> Option<T> { + fn recv<T: Send>(-p: recv_packet<T>) -> Option<T> { let p = p.unwrap(); let p = unsafe { uniquify(p) }; loop { @@ -102,7 +102,7 @@ mod pipes { } } - fn sender_terminate<T: send>(p: *packet<T>) { + fn sender_terminate<T: Send>(p: *packet<T>) { let p = unsafe { uniquify(p) }; match swap_state_rel(&mut (*p).state, terminated) { empty | blocked => { @@ -119,7 +119,7 @@ mod pipes { } } - fn receiver_terminate<T: send>(p: *packet<T>) { + fn receiver_terminate<T: Send>(p: *packet<T>) { let p = unsafe { uniquify(p) }; match swap_state_rel(&mut (*p).state, terminated) { empty => { @@ -136,7 +136,7 @@ mod pipes { } } - struct send_packet<T: send> { + struct send_packet<T: Send> { mut p: Option<*packet<T>>, drop { if self.p != None { @@ -152,13 +152,13 @@ mod pipes { } } - fn send_packet<T: send>(p: *packet<T>) -> send_packet<T> { + fn send_packet<T: Send>(p: *packet<T>) -> send_packet<T> { send_packet { p: Some(p) } } - struct recv_packet<T: send> { + struct recv_packet<T: Send> { mut p: Option<*packet<T>>, drop { if self.p != None { @@ -174,13 +174,13 @@ mod pipes { } } - fn recv_packet<T: send>(p: *packet<T>) -> recv_packet<T> { + fn recv_packet<T: Send>(p: *packet<T>) -> recv_packet<T> { recv_packet { p: Some(p) } } - fn entangle<T: send>() -> (send_packet<T>, recv_packet<T>) { + fn entangle<T: Send>() -> (send_packet<T>, recv_packet<T>) { let p = packet(); (send_packet(p), recv_packet(p)) } diff --git a/src/test/run-pass/issue-2734.rs b/src/test/run-pass/issue-2734.rs index a440d4f05d4..30a806d165d 100644 --- a/src/test/run-pass/issue-2734.rs +++ b/src/test/run-pass/issue-2734.rs @@ -1,7 +1,7 @@ trait hax { } impl <A> A: hax { } -fn perform_hax<T: owned>(x: @T) -> hax { +fn perform_hax<T: Owned>(x: @T) -> hax { x as hax } diff --git a/src/test/run-pass/issue-2735.rs b/src/test/run-pass/issue-2735.rs index 81fbae57105..0c9795cc5c3 100644 --- a/src/test/run-pass/issue-2735.rs +++ b/src/test/run-pass/issue-2735.rs @@ -1,7 +1,7 @@ trait hax { } impl <A> A: hax { } -fn perform_hax<T: owned>(x: @T) -> hax { +fn perform_hax<T: Owned>(x: @T) -> hax { x as hax } diff --git a/src/test/run-pass/issue-2904.rs b/src/test/run-pass/issue-2904.rs index b4ae83bb702..741235554ac 100644 --- a/src/test/run-pass/issue-2904.rs +++ b/src/test/run-pass/issue-2904.rs @@ -45,7 +45,7 @@ fn square_from_char(c: char) -> square { } } -fn read_board_grid<rdr: owned io::Reader>(+in: rdr) -> ~[~[square]] { +fn read_board_grid<rdr: Owned io::Reader>(+in: rdr) -> ~[~[square]] { let in = in as io::Reader; let mut grid = ~[]; for in.each_line |line| { diff --git a/src/test/run-pass/issue-2930.rs b/src/test/run-pass/issue-2930.rs index 0d24f72cb23..98cfaded04a 100644 --- a/src/test/run-pass/issue-2930.rs +++ b/src/test/run-pass/issue-2930.rs @@ -1,5 +1,5 @@ proto! stream ( - stream:send<T:send> { + stream:send<T:Send> { send(T) -> stream<T> } ) diff --git a/src/test/run-pass/issue-3149.rs b/src/test/run-pass/issue-3149.rs index fe0f646e07d..47d72c53e3b 100644 --- a/src/test/run-pass/issue-3149.rs +++ b/src/test/run-pass/issue-3149.rs @@ -1,4 +1,4 @@ -pure fn Matrix4<T:copy Num>(m11: T, m12: T, m13: T, m14: T, +pure fn Matrix4<T:Copy Num>(m11: T, m12: T, m13: T, m14: T, m21: T, m22: T, m23: T, m24: T, m31: T, m32: T, m33: T, m34: T, m41: T, m42: T, m43: T, m44: T) @@ -12,7 +12,7 @@ pure fn Matrix4<T:copy Num>(m11: T, m12: T, m13: T, m14: T, } } -struct Matrix4<T:copy Num> { +struct Matrix4<T:Copy Num> { 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/issue-333.rs b/src/test/run-pass/issue-333.rs index 3452beaf7f4..94829fdb7a8 100644 --- a/src/test/run-pass/issue-333.rs +++ b/src/test/run-pass/issue-333.rs @@ -1,5 +1,5 @@ -fn quux<T: copy>(x: T) -> T { let f = id::<T>; return f(x); } +fn quux<T: Copy>(x: T) -> T { let f = id::<T>; return f(x); } -fn id<T: copy>(x: T) -> T { return x; } +fn id<T: Copy>(x: T) -> T { return x; } fn main() { assert (quux(10) == 10); } diff --git a/src/test/run-pass/ivec-add.rs b/src/test/run-pass/ivec-add.rs index 652336145f6..9464b6923a9 100644 --- a/src/test/run-pass/ivec-add.rs +++ b/src/test/run-pass/ivec-add.rs @@ -1,4 +1,4 @@ -fn double<T: copy>(a: T) -> ~[T] { return ~[a] + ~[a]; } +fn double<T: Copy>(a: T) -> ~[T] { return ~[a] + ~[a]; } fn double_int(a: int) -> ~[int] { return ~[a] + ~[a]; } diff --git a/src/test/run-pass/kindck-owned-trait-contains-1.rs b/src/test/run-pass/kindck-owned-trait-contains-1.rs index 7de63c20e0c..afbc2561d15 100644 --- a/src/test/run-pass/kindck-owned-trait-contains-1.rs +++ b/src/test/run-pass/kindck-owned-trait-contains-1.rs @@ -1,10 +1,10 @@ trait repeat<A> { fn get() -> A; } -impl<A:copy> @A: repeat<A> { +impl<A:Copy> @A: repeat<A> { fn get() -> A { *self } } -fn repeater<A:copy>(v: @A) -> repeat<A> { +fn repeater<A:Copy>(v: @A) -> repeat<A> { // Note: owned kind is not necessary as A appears in the trait type v as repeat::<A> // No } diff --git a/src/test/run-pass/monad.rs b/src/test/run-pass/monad.rs index d3f8c668edb..36eea6e89d5 100644 --- a/src/test/run-pass/monad.rs +++ b/src/test/run-pass/monad.rs @@ -1,9 +1,9 @@ trait vec_monad<A> { - fn bind<B: copy>(f: fn(A) -> ~[B]) -> ~[B]; + fn bind<B: Copy>(f: fn(A) -> ~[B]) -> ~[B]; } impl<A> ~[A]: vec_monad<A> { - fn bind<B: copy>(f: fn(A) -> ~[B]) -> ~[B] { + fn bind<B: Copy>(f: fn(A) -> ~[B]) -> ~[B] { let mut r = ~[]; for self.each |elt| { r += f(elt); } r diff --git a/src/test/run-pass/newtype-polymorphic.rs b/src/test/run-pass/newtype-polymorphic.rs index fa6b0b86012..18f6557fdac 100644 --- a/src/test/run-pass/newtype-polymorphic.rs +++ b/src/test/run-pass/newtype-polymorphic.rs @@ -1,8 +1,8 @@ enum myvec<X> = ~[X]; -fn myvec_deref<X: copy>(mv: myvec<X>) -> ~[X] { return *mv; } +fn myvec_deref<X: Copy>(mv: myvec<X>) -> ~[X] { return *mv; } -fn myvec_elt<X: copy>(mv: myvec<X>) -> X { return mv[0]; } +fn myvec_elt<X: Copy>(mv: myvec<X>) -> X { return mv[0]; } fn main() { let mv = myvec(~[1, 2, 3]); diff --git a/src/test/run-pass/non-boolean-pure-fns.rs b/src/test/run-pass/non-boolean-pure-fns.rs index 600afd97a69..9b8bbfd9438 100644 --- a/src/test/run-pass/non-boolean-pure-fns.rs +++ b/src/test/run-pass/non-boolean-pure-fns.rs @@ -2,15 +2,15 @@ use std; use std::list::*; -pure fn pure_length_go<T: copy>(ls: @List<T>, acc: uint) -> uint { +pure fn pure_length_go<T: Copy>(ls: @List<T>, acc: uint) -> uint { match *ls { Nil => { acc } Cons(_, tl) => { pure_length_go(tl, acc + 1u) } } } -pure fn pure_length<T: copy>(ls: @List<T>) -> uint { pure_length_go(ls, 0u) } +pure fn pure_length<T: Copy>(ls: @List<T>) -> uint { pure_length_go(ls, 0u) } -pure fn nonempty_list<T: copy>(ls: @List<T>) -> bool { pure_length(ls) > 0u } +pure fn nonempty_list<T: Copy>(ls: @List<T>) -> bool { pure_length(ls) > 0u } -fn safe_head<T: copy>(ls: @List<T>) -> T { +fn safe_head<T: Copy>(ls: @List<T>) -> T { assert is_not_empty(ls); return head(ls); } diff --git a/src/test/run-pass/pipe-bank-proto.rs b/src/test/run-pass/pipe-bank-proto.rs index fc76487b436..f484e635e49 100644 --- a/src/test/run-pass/pipe-bank-proto.rs +++ b/src/test/run-pass/pipe-bank-proto.rs @@ -36,7 +36,7 @@ macro_rules! move_it ( { $x:expr } => { unsafe { let y <- *ptr::addr_of($x); y } } ) -fn switch<T: send, U>(+endp: pipes::RecvPacket<T>, +fn switch<T: Send, U>(+endp: pipes::RecvPacket<T>, f: fn(+Option<T>) -> U) -> U { f(pipes::try_recv(endp)) } diff --git a/src/test/run-pass/pipe-select.rs b/src/test/run-pass/pipe-select.rs index 7f36dbe546c..783febf942c 100644 --- a/src/test/run-pass/pipe-select.rs +++ b/src/test/run-pass/pipe-select.rs @@ -14,7 +14,7 @@ proto! oneshot ( ) proto! stream ( - stream:send<T:send> { + stream:send<T:Send> { send(T) -> stream<T> } ) diff --git a/src/test/run-pass/resource-generic.rs b/src/test/run-pass/resource-generic.rs index 1d01de738b5..392d68d8763 100644 --- a/src/test/run-pass/resource-generic.rs +++ b/src/test/run-pass/resource-generic.rs @@ -1,9 +1,9 @@ -struct finish<T: copy> { +struct finish<T: Copy> { arg: {val: T, fin: extern fn(T)}, drop { self.arg.fin(self.arg.val); } } -fn finish<T: copy>(arg: {val: T, fin: extern fn(T)}) -> finish<T> { +fn finish<T: Copy>(arg: {val: T, fin: extern fn(T)}) -> finish<T> { finish { arg: arg } diff --git a/src/test/run-pass/ret-none.rs b/src/test/run-pass/ret-none.rs index 1533bb9ef09..069618aaa05 100644 --- a/src/test/run-pass/ret-none.rs +++ b/src/test/run-pass/ret-none.rs @@ -2,6 +2,6 @@ enum option<T> { none, some(T), } -fn f<T: copy>() -> option<T> { return none; } +fn f<T: Copy>() -> option<T> { return none; } fn main() { f::<int>(); } diff --git a/src/test/run-pass/send-type-inference.rs b/src/test/run-pass/send-type-inference.rs index 67a1b618413..c642670afbc 100644 --- a/src/test/run-pass/send-type-inference.rs +++ b/src/test/run-pass/send-type-inference.rs @@ -4,9 +4,9 @@ use comm::send; use comm::Port; // tests that ctrl's type gets inferred properly -type command<K: send, V: send> = {key: K, val: V}; +type command<K: Send, V: Send> = {key: K, val: V}; -fn cache_server<K: send, V: send>(c: Chan<Chan<command<K, V>>>) { +fn cache_server<K: Send, V: Send>(c: Chan<Chan<command<K, V>>>) { let ctrl = Port(); send(c, Chan(ctrl)); } diff --git a/src/test/run-pass/sendfn-deep-copy.rs b/src/test/run-pass/sendfn-deep-copy.rs index d5ee2f1aaec..d089eb873bd 100644 --- a/src/test/run-pass/sendfn-deep-copy.rs +++ b/src/test/run-pass/sendfn-deep-copy.rs @@ -5,7 +5,7 @@ use comm::send; fn main() { test05(); } -fn mk_counter<A:copy>() -> fn~(A) -> (A,uint) { +fn mk_counter<A:Copy>() -> fn~(A) -> (A,uint) { // The only reason that the counter is generic is so that it closes // over both a type descriptor and some data. let v = ~[mut 0u]; diff --git a/src/test/run-pass/sendfn-generic-fn.rs b/src/test/run-pass/sendfn-generic-fn.rs index eece50e7570..2fcc6adfce3 100644 --- a/src/test/run-pass/sendfn-generic-fn.rs +++ b/src/test/run-pass/sendfn-generic-fn.rs @@ -7,7 +7,7 @@ fn main() { test05(); } type pair<A,B> = { a: A, b: B }; -fn make_generic_record<A: copy, B: copy>(a: A, b: B) -> pair<A,B> { +fn make_generic_record<A: Copy, B: Copy>(a: A, b: B) -> pair<A,B> { return {a: a, b: b}; } @@ -23,7 +23,7 @@ fn test05_start(&&f: fn~(&&float, &&~str) -> pair<float, ~str>) { assert q.b == ~"Ho"; } -fn spawn<A: copy, B: copy>(f: extern fn(fn~(A,B)->pair<A,B>)) { +fn spawn<A: Copy, B: Copy>(f: extern fn(fn~(A,B)->pair<A,B>)) { let arg = fn~(a: A, b: B) -> pair<A,B> { return make_generic_record(a, b); }; diff --git a/src/test/run-pass/static-impl.rs b/src/test/run-pass/static-impl.rs index f338dcef577..e29f3fdd5e4 100644 --- a/src/test/run-pass/static-impl.rs +++ b/src/test/run-pass/static-impl.rs @@ -28,13 +28,13 @@ impl uint: uint_utils { trait vec_utils<T> { fn length_() -> uint; fn iter_(f: fn(T)); - fn map_<U: copy>(f: fn(T) -> U) -> ~[U]; + fn map_<U: Copy>(f: fn(T) -> U) -> ~[U]; } impl<T> ~[T]: vec_utils<T> { fn length_() -> uint { vec::len(self) } fn iter_(f: fn(T)) { for self.each |x| { f(x); } } - fn map_<U: copy>(f: fn(T) -> U) -> ~[U] { + fn map_<U: Copy>(f: fn(T) -> U) -> ~[U] { let mut r = ~[]; for self.each |elt| { r += ~[f(elt)]; } r diff --git a/src/test/run-pass/static-method-test.rs b/src/test/run-pass/static-method-test.rs index b8832edbad9..1fc930a688e 100644 --- a/src/test/run-pass/static-method-test.rs +++ b/src/test/run-pass/static-method-test.rs @@ -5,7 +5,7 @@ trait bool_like { static fn select<A>(b: self, +x1: A, +x2: A) -> A; } -fn andand<T: bool_like copy>(x1: T, x2: T) -> T { +fn andand<T: bool_like Copy>(x1: T, x2: T) -> T { select(x1, x2, x1) } diff --git a/src/test/run-pass/trait-generic.rs b/src/test/run-pass/trait-generic.rs index 95709971e03..4c7d0415d85 100644 --- a/src/test/run-pass/trait-generic.rs +++ b/src/test/run-pass/trait-generic.rs @@ -12,10 +12,10 @@ impl (): to_str { } trait map<T> { - fn map<U: copy>(f: fn(T) -> U) -> ~[U]; + fn map<U: Copy>(f: fn(T) -> U) -> ~[U]; } impl<T> ~[T]: map<T> { - fn map<U: copy>(f: fn(T) -> U) -> ~[U] { + fn map<U: Copy>(f: fn(T) -> U) -> ~[U] { let mut r = ~[]; for self.each |x| { r += ~[f(x)]; } r diff --git a/src/test/run-pass/type-param-constraints.rs b/src/test/run-pass/type-param-constraints.rs index f9174598cce..f96c2bede61 100644 --- a/src/test/run-pass/type-param-constraints.rs +++ b/src/test/run-pass/type-param-constraints.rs @@ -1,6 +1,6 @@ fn p_foo<T>(pinned: T) { } -fn s_foo<T: copy>(shared: T) { } -fn u_foo<T: send>(unique: T) { } +fn s_foo<T: Copy>(shared: T) { } +fn u_foo<T: Send>(unique: T) { } struct r { i: int, diff --git a/src/test/run-pass/uniq-cc-generic.rs b/src/test/run-pass/uniq-cc-generic.rs index 5c7e2228ab4..18c3db591f6 100644 --- a/src/test/run-pass/uniq-cc-generic.rs +++ b/src/test/run-pass/uniq-cc-generic.rs @@ -8,7 +8,7 @@ type pointy = { d : fn~() -> uint, }; -fn make_uniq_closure<A:send copy>(a: A) -> fn~() -> uint { +fn make_uniq_closure<A:Send Copy>(a: A) -> fn~() -> uint { fn~() -> uint { ptr::addr_of(a) as uint } } diff --git a/src/test/run-pass/unique-assign-generic.rs b/src/test/run-pass/unique-assign-generic.rs index 8addb1acaf2..8a36cbd7c7d 100644 --- a/src/test/run-pass/unique-assign-generic.rs +++ b/src/test/run-pass/unique-assign-generic.rs @@ -1,4 +1,4 @@ -fn f<T: copy>(t: T) -> T { +fn f<T: Copy>(t: T) -> T { let t1 = t; t1 } diff --git a/src/test/run-pass/unique-generic-assign.rs b/src/test/run-pass/unique-generic-assign.rs index f8fd6f62c26..a299e88c344 100644 --- a/src/test/run-pass/unique-generic-assign.rs +++ b/src/test/run-pass/unique-generic-assign.rs @@ -1,6 +1,6 @@ // Issue #976 -fn f<T: copy>(x: ~T) { +fn f<T: Copy>(x: ~T) { let _x2 = x; } fn main() { } diff --git a/src/test/run-pass/unique-kinds.rs b/src/test/run-pass/unique-kinds.rs index c22b529910a..2f6c94f3f34 100644 --- a/src/test/run-pass/unique-kinds.rs +++ b/src/test/run-pass/unique-kinds.rs @@ -2,11 +2,11 @@ use cmp::Eq; fn sendable() { - fn f<T: send Eq>(i: T, j: T) { + fn f<T: Send Eq>(i: T, j: T) { assert i == j; } - fn g<T: send Eq>(i: T, j: T) { + fn g<T: Send Eq>(i: T, j: T) { assert i != j; } @@ -20,11 +20,11 @@ fn sendable() { fn copyable() { - fn f<T: copy Eq>(i: T, j: T) { + fn f<T: Copy Eq>(i: T, j: T) { assert i == j; } - fn g<T: copy Eq>(i: T, j: T) { + fn g<T: Copy Eq>(i: T, j: T) { assert i != j; } |