// Appending
#[inline(always)]
-pub pure fn append<T: Copy>(lhs: @[T], rhs: &[const T]) -> @[T] {
+pub pure fn append<T:Copy>(lhs: @[T], rhs: &[const T]) -> @[T] {
do build_sized(lhs.len() + rhs.len()) |push| {
for vec::each(lhs) |x| { push(*x); }
for uint::range(0, rhs.len()) |i| { push(rhs[i]); }
* Creates an immutable vector of size `n_elts` and initializes the elements
* to the value `t`.
*/
-pub pure fn from_elem<T: Copy>(n_elts: uint, t: T) -> @[T] {
+pub pure fn from_elem<T:Copy>(n_elts: uint, t: T) -> @[T] {
do build_sized(n_elts) |push| {
let mut i: uint = 0u;
while i < n_elts { push(copy t); i += 1u; }
use kinds::Copy;
use ops::Add;
- pub impl<T: Copy> Add<&[const T],@[T]> for @[T] {
+ pub impl<T:Copy> Add<&[const T],@[T]> for @[T] {
#[inline(always)]
pure fn add(&self, rhs: & &self/[const T]) -> @[T] {
append(*self, (*rhs))
}
#[inline(always)]
-pub pure fn lt<T: Ord>(v1: &T, v2: &T) -> bool {
+pub pure fn lt<T:Ord>(v1: &T, v2: &T) -> bool {
(*v1).lt(v2)
}
#[inline(always)]
-pub pure fn le<T: Ord>(v1: &T, v2: &T) -> bool {
+pub pure fn le<T:Ord>(v1: &T, v2: &T) -> bool {
(*v1).le(v2)
}
#[inline(always)]
-pub pure fn eq<T: Eq>(v1: &T, v2: &T) -> bool {
+pub pure fn eq<T:Eq>(v1: &T, v2: &T) -> bool {
(*v1).eq(v2)
}
#[inline(always)]
-pub pure fn ne<T: Eq>(v1: &T, v2: &T) -> bool {
+pub pure fn ne<T:Eq>(v1: &T, v2: &T) -> bool {
(*v1).ne(v2)
}
#[inline(always)]
-pub pure fn ge<T: Ord>(v1: &T, v2: &T) -> bool {
+pub pure fn ge<T:Ord>(v1: &T, v2: &T) -> bool {
(*v1).ge(v2)
}
#[inline(always)]
-pub pure fn gt<T: Ord>(v1: &T, v2: &T) -> bool {
+pub pure fn gt<T:Ord>(v1: &T, v2: &T) -> bool {
(*v1).gt(v2)
}
#[inline(always)]
-pub pure fn min<T: Ord>(v1: T, v2: T) -> T {
+pub pure fn min<T:Ord>(v1: T, v2: T) -> T {
if v1 < v2 { v1 } else { v2 }
}
#[inline(always)]
-pub pure fn max<T: Ord>(v1: T, v2: T) -> T {
+pub pure fn max<T:Ord>(v1: T, v2: T) -> T {
if v1 > v2 { v1 } else { v2 }
}
list
}
-pub fn from_vec<T: Copy>(vec: &[T]) -> @mut DList<T> {
+pub fn from_vec<T:Copy>(vec: &[T]) -> @mut DList<T> {
do vec::foldl(DList(), vec) |list,data| {
list.push(*data); // Iterating left-to-right -- add newly to the tail.
list
}
}
-impl<T: Copy> DList<T> {
+impl<T:Copy> DList<T> {
/// Remove data from the head of the list. O(1).
fn pop(@mut self) -> Option<T> {
self.pop_n().map(|nobe| nobe.data)
}
}
+impl<A:Copy> DVec<A> {
/**
* Append all elements of a vector to the end of the list
*
}
}
-pub fn lefts<T: Copy, U>(eithers: &[Either<T, U>]) -> ~[T] {
+pub fn lefts<T:Copy,U>(eithers: &[Either<T, U>]) -> ~[T] {
//! Extracts from a vector of either all the left values
do vec::build_sized(eithers.len()) |push| {
pure fn hash() -> u64;
}
-impl<A: Hash> HashUtil for A {
+impl<A:Hash> HashUtil for A {
#[inline(always)]
pure fn hash() -> u64 { self.hash_keyed(0,0) }
}
fn reset();
}
-impl<A: IterBytes> Hash for A {
+impl<A:IterBytes> Hash for A {
#[inline(always)]
pure fn hash_keyed(k0: u64, k1: u64) -> u64 {
unsafe {
((capacity as float) * 3. / 4.) as uint
}
- pub fn linear_map_with_capacity<K: Eq Hash, V>(
+ pub fn linear_map_with_capacity<K:Eq + Hash,V>(
initial_capacity: uint) -> LinearMap<K, V> {
let r = rand::task_rng();
linear_map_with_capacity_and_keys(r.gen_u64(), r.gen_u64(),
initial_capacity)
}
- pure fn linear_map_with_capacity_and_keys<K: Eq Hash, V>(
+ pure fn linear_map_with_capacity_and_keys<K:Eq + Hash,V>(
k0: u64, k1: u64,
initial_capacity: uint) -> LinearMap<K, V> {
LinearMap {
}
}
- priv impl<K: Hash IterBytes Eq, V> LinearMap<K, V> {
+ priv impl<K:Hash + IterBytes + Eq,V> LinearMap<K, V> {
#[inline(always)]
pure fn to_bucket(&self, h: uint) -> uint {
// A good hash function with entropy spread over all of the
}
}
- impl<K: Hash IterBytes Eq, V> BaseIter<(&K, &V)> for LinearMap<K, V> {
+ impl<K:Hash + IterBytes + Eq,V> BaseIter<(&K, &V)> for LinearMap<K, V> {
/// Visit all key-value pairs
pure fn each(&self, blk: fn(&(&self/K, &self/V)) -> bool) {
for uint::range(0, self.buckets.len()) |i| {
}
- impl<K: Hash IterBytes Eq, V> Container for LinearMap<K, V> {
+ impl<K:Hash + IterBytes + Eq,V> Container for LinearMap<K, V> {
/// Return the number of elements in the map
pure fn len(&self) -> uint { self.size }
pure fn is_empty(&self) -> bool { self.len() == 0 }
}
- impl<K: Hash IterBytes Eq, V> Mutable for LinearMap<K, V> {
+ impl<K:Hash + IterBytes + Eq,V> Mutable for LinearMap<K, V> {
/// Clear the map, removing all key-value pairs.
fn clear(&mut self) {
for uint::range(0, self.buckets.len()) |idx| {
}
}
- impl<K: Hash IterBytes Eq, V> Map<K, V> for LinearMap<K, V> {
+ impl<K:Hash + IterBytes + Eq,V> Map<K, V> for LinearMap<K, V> {
/// Return true if the map contains a value for the specified key
pure fn contains_key(&self, k: &K) -> bool {
match self.bucket_for_key(k) {
}
}
- pub impl<K:Hash IterBytes Eq, V> LinearMap<K, V> {
+ pub impl<K:Hash + IterBytes + Eq,V> LinearMap<K, V> {
/// Create an empty LinearMap
static fn new() -> LinearMap<K, V> {
linear_map_with_capacity(INITIAL_CAPACITY)
}
}
- impl<K: Hash IterBytes Eq, V: Eq> Eq for LinearMap<K, V> {
+ impl<K:Hash + IterBytes + Eq,V:Eq> Eq for LinearMap<K, V> {
pure fn eq(&self, other: &LinearMap<K, V>) -> bool {
if self.len() != other.len() { return false; }
priv map: LinearMap<T, ()>
}
- impl<T: Hash IterBytes Eq> BaseIter<T> for LinearSet<T> {
+ impl<T:Hash + IterBytes + Eq> BaseIter<T> for LinearSet<T> {
/// Visit all values in order
pure fn each(&self, f: fn(&T) -> bool) { self.map.each_key(f) }
pure fn size_hint(&self) -> Option<uint> { Some(self.len()) }
}
- impl<T: Hash IterBytes Eq> Eq for LinearSet<T> {
+ impl<T:Hash + IterBytes + Eq> Eq for LinearSet<T> {
pure fn eq(&self, other: &LinearSet<T>) -> bool {
self.map == other.map
}
}
}
- impl<T: Hash IterBytes Eq> Container for LinearSet<T> {
+ impl<T:Hash + IterBytes + Eq> Container for LinearSet<T> {
/// Return the number of elements in the set
pure fn len(&self) -> uint { self.map.len() }
pure fn is_empty(&self) -> bool { self.map.is_empty() }
}
- impl<T: Hash IterBytes Eq> Mutable for LinearSet<T> {
+ impl<T:Hash + IterBytes + Eq> Mutable for LinearSet<T> {
/// Clear the set, removing all values.
fn clear(&mut self) { self.map.clear() }
}
- impl<T: Hash IterBytes Eq> Set<T> for LinearSet<T> {
+ impl<T:Hash + IterBytes + Eq> Set<T> for LinearSet<T> {
/// Return true if the set contains a value
pure fn contains(&self, value: &T) -> bool {
self.map.contains_key(value)
}
}
- pub impl <T: Hash IterBytes Eq> LinearSet<T> {
+ pub impl <T:Hash + IterBytes + Eq> LinearSet<T> {
/// Create an empty LinearSet
static fn new() -> LinearSet<T> { LinearSet{map: LinearMap::new()} }
fn read_i8(&self) -> i8;
}
-impl<T: Reader> ReaderUtil for T {
+impl<T:Reader> ReaderUtil for T {
fn read_bytes(&self,len: uint) -> ~[u8] {
let mut bytes = vec::with_capacity(len);
fn read_chars(&self, n: uint) -> ~[char] {
// returns the (consumed offset, n_req), appends characters to &chars
- fn chars_from_bytes<T: Reader>(bytes: &~[u8], chars: &mut ~[char])
+ fn chars_from_bytes<T:Reader>(bytes: &~[u8], chars: &mut ~[char])
-> (uint, uint) {
let mut i = 0;
let bytes_len = bytes.len();
// A forwarding impl of reader that also holds on to a resource for the
// duration of its lifetime.
// FIXME there really should be a better way to do this // #2004
-impl<R: Reader, C> Reader for Wrapper<R, C> {
+impl<R:Reader,C> Reader for Wrapper<R, C> {
fn read(&self, bytes: &mut [u8], len: uint) -> uint {
self.base.read(bytes, len)
}
fn get_type(&self) -> WriterType;
}
-impl<W: Writer, C> Writer for Wrapper<W, C> {
+impl<W:Writer,C> Writer for Wrapper<W, C> {
fn write(&self, bs: &[const u8]) { self.base.write(bs); }
fn seek(&self, off: int, style: SeekStyle) { self.base.seek(off, style); }
fn tell(&self) -> uint { self.base.tell() }
fn write_i8(&self, n: i8);
}
-impl<T: Writer> WriterUtil for T {
+impl<T:Writer> WriterUtil for T {
fn write_char(&self, ch: char) {
if ch as uint < 128u {
self.write(&[ch as u8]);
arg: Arg<t>,
}
- impl<T: Copy> Drop for Res<T> {
+ impl<T:Copy> Drop for Res<T> {
fn finalize(&self) {
match self.arg.opt_level {
None => (),
}
-impl<A:
Eq> iter::EqIter<A> for IMPL_T<A> {
+impl<A:Eq> iter::EqIter<A> for IMPL_T<A> {
#[inline(always)]
pure fn contains(&self, x: &A) -> bool { iter::contains(self, x) }
#[inline(always)]
pure fn count(&self, x: &A) -> uint { iter::count(self, x) }
}
-impl<A:
Copy> iter::CopyableIter<A> for IMPL_T<A> {
+impl<A:Copy> iter::CopyableIter<A> for IMPL_T<A> {
#[inline(always)]
pure fn filter_to_vec(&self, pred: fn(&A) -> bool) -> ~[A] {
iter::filter_to_vec(self, pred)
}
}
-impl<A:
Copy Ord> iter::CopyableOrderedIter<A> for IMPL_T<A> {
+impl<A:
Copy + Ord> iter::CopyableOrderedIter<A> for IMPL_T<A> {
#[inline(always)]
pure fn min(&self) -> A { iter::min(self) }
#[inline(always)]
pure fn find(&self, p: fn(&A) -> bool) -> Option<A>;
}
-pub trait CopyableOrderedIter<A:Copy Ord> {
+pub trait CopyableOrderedIter<A:Copy + Ord> {
pure fn min(&self) -> A;
pure fn max(&self) -> A;
}
}
#[inline(always)]
-pub pure fn min<A:Copy Ord,IA:BaseIter<A>>(self: &IA) -> A {
+pub pure fn min<A:Copy
+ Ord,IA:BaseIter<A>>(self: &IA) -> A {
match do foldl::<A,Option<A>,IA>(self, None) |a, b| {
match a {
&Some(ref a_) if *a_ < *b => {
}
#[inline(always)]
-pub pure fn max<A:Copy Ord,IA:BaseIter<A>>(self: &IA) -> A {
+pub pure fn max<A:Copy
+ Ord,IA:BaseIter<A>>(self: &IA) -> A {
match do foldl::<A,Option<A>,IA>(self, None) |a, b| {
match a {
&Some(ref a_) if *a_ > *b => {
}
#[inline(always)]
-pub pure fn find<A:
Copy,IA:BaseIter<A>>(self: &IA,
+pub pure fn find<A:Copy,IA:BaseIter<A>>(self: &IA,
f: fn(&A) -> bool) -> Option<A> {
for self.each |i| {
if f(i) { return Some(*i) }
* to the value `t`.
*/
#[inline(always)]
-pub pure fn from_elem<T: Copy,BT: Buildable<T>>(n_elts: uint,
+pub pure fn from_elem<T:Copy,BT:Buildable<T>>(n_elts: uint,
t: T) -> BT {
do Buildable::build_sized(n_elts) |push| {
let mut i: uint = 0;
/// Appending two generic sequences
#[inline(always)]
-pub pure fn append<T: Copy,IT: BaseIter<T>,BT: Buildable<T>>(
+pub pure fn append<T:Copy,IT:BaseIter<T>,BT:Buildable<T>>(
lhs: &IT, rhs: &IT) -> BT {
let size_opt = lhs.size_hint().chain_ref(
|sz1| rhs.size_hint().map(|sz2| *sz1+*sz2));
/// Copies a generic sequence, possibly converting it to a different
/// type of sequence.
#[inline(always)]
-pub pure fn copy_seq<T: Copy,IT: BaseIter<T>,BT: Buildable<T>>(
+pub pure fn copy_seq<T:Copy,IT:BaseIter<T>,BT:Buildable<T>>(
v: &IT) -> BT {
do build_sized_opt(v.size_hint()) |push| {
for v.each |x| { push(*x); }
* ~~~
*/
#[inline(always)]
-pub pure fn cast<T:NumCast, U:NumCast>(n: T) -> U {
+pub pure fn cast<T:NumCast,U:NumCast>(n: T) -> U {
NumCast::from(n)
}
}
#[inline(always)]
-pub pure fn get<T: Copy>(opt: Option<T>) -> T {
+pub pure fn get<T:Copy>(opt: Option<T>) -> T {
/*!
Gets the value out of an option
}
#[inline(always)]
-pub pure fn get_or_zero<T: Copy Zero>(opt: Option<T>) -> T {
+pub pure fn get_or_zero<T:Copy + Zero>(opt: Option<T>) -> T {
//! Returns the contained value or zero (for this type)
match opt { Some(copy x) => x, None => Zero::zero() }
}
#[inline(always)]
-pub pure fn get_or_default<T: Copy>(opt: Option<T>, def: T) -> T {
+pub pure fn get_or_default<T:Copy>(opt: Option<T>, def: T) -> T {
//! Returns the contained value or a default
match opt { Some(copy x) => x, None => def }
pure fn expect(self, reason: &str) -> T { expect(self, reason) }
}
-impl<T: Copy> Option<T> {
+impl<T:Copy> Option<T> {
/**
Gets the value out of an option
}
}
-impl<T: Copy Zero> Option<T> {
+impl<T:Copy + Zero> Option<T> {
#[inline(always)]
pure fn get_or_zero(self) -> T { get_or_zero(self) }
}
reinterpret_cast(&self.buffer)
}
- fn set_buffer<T: Owned>(b: ~Buffer<T>) {
+ fn set_buffer<T:Owned>(b: ~Buffer<T>) {
unsafe {
self.buffer = reinterpret_cast(&b);
}
fn set_buffer(b: *libc::c_void);
}
-impl<T: Owned> HasBuffer for Packet<T> {
+impl<T:Owned> HasBuffer for Packet<T> {
fn set_buffer(b: *libc::c_void) {
self.header.buffer = b;
}
}
#[doc(hidden)]
-pub fn mk_packet<T: Owned>() -> Packet<T> {
+pub fn mk_packet<T:Owned>() -> Packet<T> {
Packet {
header: PacketHeader(),
payload: None,
}
#[doc(hidden)]
-pub fn entangle_buffer<T: Owned, Tstart: Owned>(
+pub fn entangle_buffer<T:Owned,Tstart:Owned>(
buffer: ~Buffer<T>,
init: fn(*libc::c_void, x: &T) -> *Packet<Tstart>)
-> (SendPacketBuffered<Tstart, T>, RecvPacketBuffered<Tstart, T>)
Fails if the sender closes the connection.
*/
-pub fn recv<T: Owned, Tbuffer: Owned>(
+pub fn recv<T:Owned,Tbuffer:Owned>(
p: RecvPacketBuffered<T, Tbuffer>) -> T {
try_recv(p).expect("connection closed")
}
a message, or `Some(T)` if a message was received.
*/
-pub fn try_recv<T: Owned, Tbuffer: Owned>(p: RecvPacketBuffered<T, Tbuffer>)
+pub fn try_recv<T:Owned,Tbuffer:Owned>(p: RecvPacketBuffered<T, Tbuffer>)
-> Option<T>
{
let p_ = p.unwrap();
}
/// Returns true if messages are available.
-pub pure fn peek<T: Owned, Tb: Owned>(p: &RecvPacketBuffered<T, Tb>) -> bool {
+pub pure fn peek<T:Owned,Tb:Owned>(p: &RecvPacketBuffered<T, Tb>) -> bool {
match unsafe {(*p.header()).state} {
Empty | Terminated => false,
Blocked => fail!(~"peeking on blocked packet"),
}
}
-impl<T: Owned, Tb: Owned> Peekable<T> for RecvPacketBuffered<T, Tb> {
+impl<T:Owned,Tb:Owned> Peekable<T> for RecvPacketBuffered<T, Tb> {
pure fn peek() -> bool {
peek(&self)
}
}
#[doc(hidden)]
-fn sender_terminate<T: Owned>(p: *Packet<T>) {
+fn sender_terminate<T:Owned>(p: *Packet<T>) {
let p = unsafe { &*p };
match swap_state_rel(&mut p.header.state, Terminated) {
Empty => {
}
#[doc(hidden)]
-fn receiver_terminate<T: Owned>(p: *Packet<T>) {
+fn receiver_terminate<T:Owned>(p: *Packet<T>) {
let p = unsafe { &*p };
match swap_state_rel(&mut p.header.state, Terminated) {
Empty => {
closed by the sender or has a message waiting to be received.
*/
-fn wait_many<T: Selectable>(pkts: &[T]) -> uint {
+fn wait_many<T:Selectable>(pkts: &[T]) -> uint {
let this = unsafe { rustrt::rust_get_task() };
unsafe {
this case, `select2` may return either `left` or `right`.
*/
-pub fn select2<A: Owned, Ab: Owned, B: Owned, Bb: Owned>(
+pub fn select2<A:Owned,Ab:Owned,B:Owned,Bb:Owned>(
a: RecvPacketBuffered<A, Ab>,
b: RecvPacketBuffered<B, Bb>)
-> Either<(Option<A>, RecvPacketBuffered<B, Bb>),
}
/// Returns the index of an endpoint that is ready to receive.
-pub fn selecti<T: Selectable>(endpoints: &[T]) -> uint {
+pub fn selecti<T:Selectable>(endpoints: &[T]) -> uint {
wait_many(endpoints)
}
/// Returns 0 or 1 depending on which endpoint is ready to receive
-pub fn select2i<A: Selectable, B: Selectable>(a: &A, b: &B) ->
+pub fn select2i<A:Selectable,B:Selectable>(a: &A, b: &B) ->
Either<(), ()> {
match wait_many([a.header(), b.header()]) {
0 => Left(()),
list of the remaining endpoints.
*/
-pub fn select<T: Owned, Tb: Owned>(endpoints: ~[RecvPacketBuffered<T, Tb>])
+pub fn select<T:Owned,Tb:Owned>(endpoints: ~[RecvPacketBuffered<T, Tb>])
-> (uint, Option<T>, ~[RecvPacketBuffered<T, Tb>])
{
let ready = wait_many(endpoints.map(|p| p.header()));
mut buffer: Option<BufferResource<Tbuffer>>,
}
-impl<T:Owned, Tbuffer:Owned> ::ops::Drop for RecvPacketBuffered<T,Tbuffer> {
+impl<T:Owned,Tbuffer:Owned> ::ops::Drop for RecvPacketBuffered<T,Tbuffer> {
fn finalize(&self) {
//if self.p != none {
// debug!("drop recv %?", option::get(self.p));
}
}
-impl<T: Owned, Tbuffer: Owned> RecvPacketBuffered<T, Tbuffer> {
+impl<T:Owned,Tbuffer:Owned> RecvPacketBuffered<T, Tbuffer> {
fn unwrap() -> *Packet<T> {
let mut p = None;
p <-> self.p;
}
}
-impl<T: Owned, Tbuffer: Owned> Selectable for RecvPacketBuffered<T, Tbuffer> {
+impl<T:Owned,Tbuffer:Owned> Selectable for RecvPacketBuffered<T, Tbuffer> {
pure fn header() -> *PacketHeader {
match self.p {
Some(packet) => unsafe {
endpoint is passed to the new task.
*/
-pub fn spawn_service<T: Owned, Tb: Owned>(
+pub fn spawn_service<T:Owned,Tb:Owned>(
init: extern fn() -> (SendPacketBuffered<T, Tb>,
RecvPacketBuffered<T, Tb>),
service: fn~(v: RecvPacketBuffered<T, Tb>))
receive state.
*/
-pub fn spawn_service_recv<T: Owned, Tb: Owned>(
+pub fn spawn_service_recv<T:Owned,Tb:Owned>(
init: extern fn() -> (RecvPacketBuffered<T, Tb>,
SendPacketBuffered<T, Tb>),
service: fn~(v: SendPacketBuffered<T, Tb>))
// Streams - Make pipes a little easier in general.
proto! streamp (
- Open:send<T: Owned> {
+ Open:send<T:Owned> {
data(T) -> Open<T>
}
)
(Port_(Port_ { endp: Some(s) }), Chan_(Chan_{ endp: Some(c) }))
}
-impl<T: Owned> GenericChan<T> for Chan<T> {
+impl<T:Owned> GenericChan<T> for Chan<T> {
fn send(x: T) {
let mut endp = None;
endp <-> self.endp;
}
}
-impl<T: Owned> GenericSmartChan<T> for Chan<T> {
+impl<T:Owned> GenericSmartChan<T> for Chan<T> {
fn try_send(x: T) -> bool {
let mut endp = None;
}
}
-impl<T: Owned> GenericPort<T> for Port<T> {
+impl<T:Owned> GenericPort<T> for Port<T> {
fn recv() -> T {
let mut endp = None;
endp <-> self.endp;
}
}
-impl<T: Owned> Peekable<T> for Port<T> {
+impl<T:Owned> Peekable<T> for Port<T> {
pure fn peek() -> bool {
unsafe {
let mut endp = None;
}
}
-impl<T: Owned> Selectable for Port<T> {
+impl<T:Owned> Selectable for Port<T> {
pure fn header() -> *PacketHeader {
unsafe {
match self.endp {
mut ports: ~[pipes::Port<T>],
}
-pub fn PortSet<T: Owned>() -> PortSet<T>{
+pub fn PortSet<T:Owned>() -> PortSet<T>{
PortSet {
ports: ~[]
}
}
-impl<T: Owned> PortSet<T> {
+impl<T:Owned> PortSet<T> {
fn add(port: pipes::Port<T>) {
self.ports.push(port)
}
}
-impl<T: Owned> GenericPort<T> for PortSet<T> {
+impl<T:Owned> GenericPort<T> for PortSet<T> {
fn try_recv() -> Option<T> {
let mut result = None;
}
-impl<T: Owned> Peekable<T> for PortSet<T> {
+impl<T:Owned> Peekable<T> for PortSet<T> {
pure fn peek() -> bool {
// It'd be nice to use self.port.each, but that version isn't
// pure.
/// A channel that can be shared between many senders.
pub type SharedChan<T> = private::Exclusive<Chan<T>>;
-impl<T: Owned> GenericChan<T> for SharedChan<T> {
+impl<T:Owned> GenericChan<T> for SharedChan<T> {
fn send(x: T) {
let mut xx = Some(x);
do self.with_imm |chan| {
}
}
-impl<T: Owned> GenericSmartChan<T> for SharedChan<T> {
+impl<T:Owned> GenericSmartChan<T> for SharedChan<T> {
fn try_send(x: T) -> bool {
let mut xx = Some(x);
do self.with_imm |chan| {
}
/// Receive a message from one of two endpoints.
-pub trait Select2<T: Owned, U: Owned> {
+pub trait Select2<T:Owned,U:Owned> {
/// Receive a message or return `None` if a connection closes.
fn try_select() -> Either<Option<T>, Option<U>>;
/// Receive a message or fail if a connection closes.
pub type PortOne<T> = oneshot::server::Oneshot<T>;
/// Initialiase a (send-endpoint, recv-endpoint) oneshot pipe pair.
-pub fn oneshot<T: Owned>() -> (PortOne<T>, ChanOne<T>) {
+pub fn oneshot<T:Owned>() -> (PortOne<T>, ChanOne<T>) {
let (chan, port) = oneshot::init();
(port, chan)
}
-impl<T: Owned> PortOne<T> {
+impl<T:Owned> PortOne<T> {
fn recv(self) -> T { recv_one(self) }
fn try_recv(self) -> Option<T> { try_recv_one(self) }
}
-impl<T: Owned> ChanOne<T> {
+impl<T:Owned> ChanOne<T> {
fn send(self, data: T) { send_one(self, data) }
fn try_send(self, data: T) -> bool { try_send_one(self, data) }
}
* Receive a message from a oneshot pipe, failing if the connection was
* closed.
*/
-pub fn recv_one<T: Owned>(port: PortOne<T>) -> T {
+pub fn recv_one<T:Owned>(port: PortOne<T>) -> T {
let oneshot::send(message) = recv(port);
message
}
/// Receive a message from a oneshot pipe unless the connection was closed.
-pub fn try_recv_one<T: Owned> (port: PortOne<T>) -> Option<T> {
+pub fn try_recv_one<T:Owned> (port: PortOne<T>) -> Option<T> {
let message = try_recv(port);
if message.is_none() { None }
}
/// Send a message on a oneshot pipe, failing if the connection was closed.
-pub fn send_one<T: Owned>(chan: ChanOne<T>, data: T) {
+pub fn send_one<T:Owned>(chan: ChanOne<T>, data: T) {
oneshot::client::send(chan, data);
}
* Send a message on a oneshot pipe, or return false if the connection was
* closed.
*/
-pub fn try_send_one<T: Owned>(chan: ChanOne<T>, data: T)
+pub fn try_send_one<T:Owned>(chan: ChanOne<T>, data: T)
-> bool {
oneshot::client::try_send(chan, data).is_some()
}
}
}
-pub unsafe fn unwrap_shared_mutable_state<T: Owned>(rc: SharedMutableState<T>)
+pub unsafe fn unwrap_shared_mutable_state<T:Owned>(rc: SharedMutableState<T>)
-> T {
struct DeathThroes<T> {
mut ptr: Option<~ArcData<T>>,
*/
pub type SharedMutableState<T> = ArcDestruct<T>;
-pub unsafe fn shared_mutable_state<T: Owned>(data: T) ->
+pub unsafe fn shared_mutable_state<T:Owned>(data: T) ->
SharedMutableState<T> {
let data = ~ArcData { count: 1, unwrapper: 0, data: Some(data) };
unsafe {
}
#[inline(always)]
-pub unsafe fn get_shared_mutable_state<T: Owned>(
+pub unsafe fn get_shared_mutable_state<T:Owned>(
rc: *SharedMutableState<T>) -> *mut T
{
unsafe {
}
}
#[inline(always)]
-pub unsafe fn get_shared_immutable_state<T: Owned>(
+pub unsafe fn get_shared_immutable_state<T:Owned>(
rc: &a/SharedMutableState<T>) -> &a/T {
unsafe {
let ptr: ~ArcData<T> = cast::reinterpret_cast(&(*rc).data);
}
}
-pub unsafe fn clone_shared_mutable_state<T: Owned>(rc: &SharedMutableState<T>)
+pub unsafe fn clone_shared_mutable_state<T:Owned>(rc: &SharedMutableState<T>)
-> SharedMutableState<T> {
unsafe {
let ptr: ~ArcData<T> = cast::reinterpret_cast(&(*rc).data);
ArcDestruct((*rc).data)
}
-impl<T: Owned> Clone for SharedMutableState<T> {
+impl<T:Owned> Clone for SharedMutableState<T> {
fn clone(&self) -> SharedMutableState<T> {
unsafe {
clone_shared_mutable_state(self)
*/
pub struct Exclusive<T> { x: SharedMutableState<ExData<T>> }
-pub fn exclusive<T:Owned >(user_data: T) -> Exclusive<T> {
+pub fn exclusive<T:Owned>(user_data: T) -> Exclusive<T> {
let data = ExData {
lock: LittleLock(), mut failed: false, mut data: user_data
};
Exclusive { x: unsafe { shared_mutable_state(data) } }
}
-impl<T: Owned> Clone for Exclusive<T> {
+impl<T:Owned> Clone for Exclusive<T> {
// Duplicate an exclusive ARC, as std::arc::clone.
fn clone(&self) -> Exclusive<T> {
Exclusive { x: unsafe { clone_shared_mutable_state(&self.x) } }
}
}
-impl<T: Owned> Exclusive<T> {
+impl<T:Owned> Exclusive<T> {
// Exactly like std::arc::mutex_arc,access(), but with the little_lock
// instead of a proper mutex. Same reason for being unsafe.
//
}
// FIXME(#3724) make this a by-move method on the exclusive
-pub fn unwrap_exclusive<T: Owned>(arc: Exclusive<T>) -> T {
+pub fn unwrap_exclusive<T:Owned>(arc: Exclusive<T>) -> T {
let Exclusive { x: x } = arc;
let inner = unsafe { unwrap_shared_mutable_state(x) };
let ExData { data: data, _ } = inner;
pub type GlobalDataKey<T> = &fn(v: T);
-pub unsafe fn global_data_clone_create<T: Owned Clone>(
+pub unsafe fn global_data_clone_create<T:Owned + Clone>(
key: GlobalDataKey<T>, create: &fn() -> ~T) -> T {
/*!
* Clone a global value or, if it has not been created,
global_data_clone_create_(key_ptr(key), create)
}
-unsafe fn global_data_clone_create_<T: Owned Clone>(
+unsafe fn global_data_clone_create_<T:Owned + Clone>(
key: uint, create: &fn() -> ~T) -> T {
let mut clone_value: Option<T> = None;
return clone_value.unwrap();
}
-unsafe fn global_data_modify<T: Owned>(
+unsafe fn global_data_modify<T:Owned>(
key: GlobalDataKey<T>, op: &fn(Option<~T>) -> Option<~T>) {
global_data_modify_(key_ptr(key), op)
}
-unsafe fn global_data_modify_<T: Owned>(
+unsafe fn global_data_modify_<T:Owned>(
key: uint, op: &fn(Option<~T>) -> Option<~T>) {
let mut old_dtor = None;
}
}
-pub unsafe fn global_data_clone<T: Owned Clone>(
+pub unsafe fn global_data_clone<T:Owned + Clone>(
key: GlobalDataKey<T>) -> Option<T> {
let mut maybe_clone: Option<T> = None;
do global_data_modify(key) |current| {
}
}
-fn key_ptr<T: Owned>(key: GlobalDataKey<T>) -> uint {
+fn key_ptr<T:Owned>(key: GlobalDataKey<T>) -> uint {
unsafe {
let closure: Closure = reinterpret_cast(&key);
return transmute(closure.code);
}
}
-impl<T: Rand> Rand for Option<T> {
+impl<T:Rand> Rand for Option<T> {
static fn rand(rng: rand::Rng) -> Option<T> {
if rng.gen_bool() { Some(Rand::rand(rng)) }
else { None }
/// Extension methods for random number generators
impl Rng {
/// Return a random value for a Rand type
- fn gen<T: Rand>() -> T {
+ fn gen<T:Rand>() -> T {
Rand::rand(self)
}
* Choose an item respecting the relative weights, failing if the sum of
* the weights is 0
*/
- fn choose_weighted<T: Copy>(v : &[Weighted<T>]) -> T {
+ fn choose_weighted<T:Copy>(v : &[Weighted<T>]) -> T {
self.choose_weighted_option(v).get()
}
pub struct MovePtrAdaptor<V> {
inner: V
}
-pub fn MovePtrAdaptor<V: TyVisitor MovePtr>(v: V) -> MovePtrAdaptor<V> {
+pub fn MovePtrAdaptor<V:TyVisitor + MovePtr>(v: V) -> MovePtrAdaptor<V> {
MovePtrAdaptor { inner: v }
}
-impl<V: TyVisitor MovePtr> MovePtrAdaptor<V> {
+impl<V:TyVisitor + MovePtr> MovePtrAdaptor<V> {
#[inline(always)]
fn bump(sz: uint) {
do self.inner.move_ptr() |p| {
}
/// Abstract type-directed pointer-movement using the MovePtr trait
-impl<V: TyVisitor MovePtr> TyVisitor for MovePtrAdaptor<V> {
+impl<V:TyVisitor + MovePtr> TyVisitor for MovePtrAdaptor<V> {
fn visit_bot(&self) -> bool {
self.align_to::<()>();
if ! self.inner.visit_bot() { return false; }
* If the result is an error
*/
#[inline(always)]
-pub pure fn get<T: Copy, U>(res: &Result<T, U>) -> T {
+pub pure fn get<T:Copy,U>(res: &Result<T, U>) -> T {
match *res {
Ok(copy t) => t,
Err(ref the_err) => unsafe {
* result variants are converted to `either::left`.
*/
#[inline(always)]
-pub pure fn to_either<T: Copy, U: Copy>(res: &Result<U, T>)
+pub pure fn to_either<T:Copy,U:Copy>(res: &Result<U, T>)
-> Either<T, U> {
match *res {
Ok(copy res) => either::Right(res),
* successful result while handling an error.
*/
#[inline(always)]
-pub pure fn map_err<T: Copy, E, F: Copy>(res: &Result<T, E>, op: fn(&E) -> F)
+pub pure fn map_err<T:Copy,E,F:Copy>(res: &Result<T, E>, op: fn(&E) -> F)
-> Result<T, F> {
match *res {
Ok(copy t) => Ok(t),
}
}
-impl<T: Copy, E> Result<T, E> {
+impl<T:Copy,E> Result<T, E> {
#[inline(always)]
pure fn get(&self) -> T { get(self) }
* Remove a task-local data value from the table, returning the
* reference that was originally created to insert it.
*/
-pub unsafe fn local_data_pop<T: Durable>(
+pub unsafe fn local_data_pop<T:Durable>(
key: LocalDataKey<T>) -> Option<@T> {
local_pop(rt::rust_get_task(), key)
* Retrieve a task-local data value. It will also be kept alive in the
* table until explicitly removed.
*/
-pub unsafe fn local_data_get<T: Durable>(
+pub unsafe fn local_data_get<T:Durable>(
key: LocalDataKey<T>) -> Option<@T> {
local_get(rt::rust_get_task(), key)
* Store a value in task-local data. If this key already has a value,
* that value is overwritten (and its destructor is run).
*/
-pub unsafe fn local_data_set<T: Durable>(
+pub unsafe fn local_data_set<T:Durable>(
key: LocalDataKey<T>, data: @T) {
local_set(rt::rust_get_task(), key, data)
* Modify a task-local data value. If the function returns 'None', the
* data is removed (and its reference dropped).
*/
-pub unsafe fn local_data_modify<T: Durable>(
+pub unsafe fn local_data_modify<T:Durable>(
key: LocalDataKey<T>,
modify_fn: fn(Option<@T>) -> Option<@T>) {
type rust_task = libc::c_void;
pub trait LocalData { }
-impl<T: Durable> LocalData for @T { }
+impl<T:Durable> LocalData for @T { }
impl Eq for LocalData {
pure fn eq(&self, other: &@LocalData) -> bool {
}
}
-unsafe fn key_to_key_value<T: Durable>(
+unsafe fn key_to_key_value<T:Durable>(
key: LocalDataKey<T>) -> *libc::c_void {
// Keys are closures, which are (fnptr,envptr) pairs. Use fnptr.
}
// If returning Some(..), returns with @T with the map's reference. Careful!
-unsafe fn local_data_lookup<T: Durable>(
+unsafe fn local_data_lookup<T:Durable>(
map: TaskLocalMap, key: LocalDataKey<T>)
-> Option<(uint, *libc::c_void)> {
}
}
-unsafe fn local_get_helper<T: Durable>(
+unsafe fn local_get_helper<T:Durable>(
task: *rust_task, key: LocalDataKey<T>,
do_pop: bool) -> Option<@T> {
}
-pub unsafe fn local_pop<T: Durable>(
+pub unsafe fn local_pop<T:Durable>(
task: *rust_task,
key: LocalDataKey<T>) -> Option<@T> {
local_get_helper(task, key, true)
}
-pub unsafe fn local_get<T: Durable>(
+pub unsafe fn local_get<T:Durable>(
task: *rust_task,
key: LocalDataKey<T>) -> Option<@T> {
local_get_helper(task, key, false)
}
-pub unsafe fn local_set<T: Durable>(
+pub unsafe fn local_set<T:Durable>(
task: *rust_task, key: LocalDataKey<T>, data: @T) {
let map = get_task_local_map(task);
}
}
-pub unsafe fn local_modify<T: Durable>(
+pub unsafe fn local_modify<T:Durable>(
task: *rust_task, key: LocalDataKey<T>,
modify_fn: fn(Option<@T>) -> Option<@T>) {
spawn::spawn_raw(opts, (x.gen_body)(f));
}
/// Runs a task, while transfering ownership of one argument to the child.
- fn spawn_with<A: Owned>(arg: A, f: fn~(v: A)) {
+ fn spawn_with<A:Owned>(arg: A, f: fn~(v: A)) {
let arg = ~mut Some(arg);
do self.spawn || {
f(option::swap_unwrap(arg))
* # Failure
* Fails if a future_result was already set for this task.
*/
- fn try<T: Owned>(f: fn~() -> T) -> Result<T,()> {
+ fn try<T:Owned>(f: fn~() -> T) -> Result<T,()> {
let (po, ch) = stream::<T>();
let mut result = None;
}
}
-impl<A: IterBytes> IterBytes for &[A] {
+impl<A:IterBytes> IterBytes for &[A] {
#[inline(always)]
pure fn iter_bytes(&self, lsb0: bool, f: Cb) {
for (*self).each |elt| {
}
}
-impl<A: IterBytes, B: IterBytes> IterBytes for (A,B) {
+impl<A:IterBytes,B:IterBytes> IterBytes for (A,B) {
#[inline(always)]
pure fn iter_bytes(&self, lsb0: bool, f: Cb) {
match *self {
}
}
-impl<A: IterBytes, B: IterBytes, C: IterBytes> IterBytes for (A,B,C) {
+impl<A:IterBytes,B:IterBytes,C:IterBytes> IterBytes for (A,B,C) {
#[inline(always)]
pure fn iter_bytes(&self, lsb0: bool, f: Cb) {
match *self {
a
}
-impl<A: IterBytes> IterBytes for ~[A] {
+impl<A:IterBytes> IterBytes for ~[A] {
#[inline(always)]
pure fn iter_bytes(&self, lsb0: bool, f: Cb) {
borrow(*self).iter_bytes(lsb0, f)
}
}
-impl<A: IterBytes> IterBytes for @[A] {
+impl<A:IterBytes> IterBytes for @[A] {
#[inline(always)]
pure fn iter_bytes(&self, lsb0: bool, f: Cb) {
borrow(*self).iter_bytes(lsb0, f)
}
}
-pub pure fn iter_bytes_2<A: IterBytes, B: IterBytes>(a: &A, b: &B,
+pub pure fn iter_bytes_2<A:IterBytes,B:IterBytes>(a: &A, b: &B,
lsb0: bool, z: Cb) {
let mut flag = true;
a.iter_bytes(lsb0, |bytes| {flag = z(bytes); flag});
}
}
-impl<A:
IterBytes> IterBytes for Option<A> {
+impl<A:IterBytes> IterBytes for Option<A> {
#[inline(always)]
pure fn iter_bytes(&self, lsb0: bool, f: Cb) {
match *self {
}
}
-impl<A: IterBytes> IterBytes for &A {
+impl<A:IterBytes> IterBytes for &A {
#[inline(always)]
pure fn iter_bytes(&self, lsb0: bool, f: Cb) {
(**self).iter_bytes(lsb0, f);
}
}
-impl<A: IterBytes> IterBytes for @A {
+impl<A:IterBytes> IterBytes for @A {
#[inline(always)]
pure fn iter_bytes(&self, lsb0: bool, f: Cb) {
(**self).iter_bytes(lsb0, f);
}
}
-impl<A: IterBytes> IterBytes for ~A {
+impl<A:IterBytes> IterBytes for ~A {
#[inline(always)]
pure fn iter_bytes(&self, lsb0: bool, f: Cb) {
(**self).iter_bytes(lsb0, f);
fn to_bytes(&self, lsb0: bool) -> ~[u8];
}
-impl<A: IterBytes> ToBytes for A {
+impl<A:IterBytes> ToBytes for A {
fn to_bytes(&self, lsb0: bool) -> ~[u8] {
do io::with_bytes_writer |wr| {
for self.iter_bytes(lsb0) |bytes| {
// FIXME #4898: impl for one-tuples
-impl<A: ToStr, B: ToStr> ToStr for (A, B) {
+impl<A:ToStr,B:ToStr> ToStr for (A, B) {
#[inline(always)]
pure fn to_str(&self) -> ~str {
// FIXME(#4760): this causes an llvm assertion
}
}
}
-impl<A: ToStr, B: ToStr, C: ToStr> ToStr for (A, B, C) {
+impl<A:ToStr,B:ToStr,C:ToStr> ToStr for (A, B, C) {
#[inline(always)]
pure fn to_str(&self) -> ~str {
// FIXME(#4760): this causes an llvm assertion
}
}
-impl<A: ToStr> ToStr for ~[A] {
+impl<A:ToStr> ToStr for ~[A] {
#[inline(always)]
pure fn to_str(&self) -> ~str {
unsafe {
}
}
-impl<A: ToStr> ToStr for @A {
+impl<A:ToStr> ToStr for @A {
#[inline(always)]
pure fn to_str(&self) -> ~str { ~"@" + (**self).to_str() }
}
-impl<A: ToStr> ToStr for ~A {
+impl<A:ToStr> ToStr for ~A {
#[inline(always)]
pure fn to_str(&self) -> ~str { ~"~" + (**self).to_str() }
}
pure fn swap() -> (U, T);
}
-impl<T: Copy, U: Copy> CopyableTuple<T, U> for (T, U) {
+impl<T:Copy,U:Copy> CopyableTuple<T, U> for (T, U) {
/// Return the first element of self
#[inline(always)]
fn map<C>(&self, f: &fn(a: &A, b: &B) -> C) -> ~[C];
}
-impl<A:
Copy, B: Copy> ExtendedTupleOps<A,B> for (&[A], &[B]) {
+impl<A:
Copy,B:Copy> ExtendedTupleOps<A,B> for (&[A], &[B]) {
#[inline(always)]
fn zip(&self) -> ~[(A, B)] {
match *self {
}
}
-impl<A:
Copy, B: Copy> ExtendedTupleOps<A,B> for (~[A], ~[B]) {
+impl<A:
Copy,B:Copy> ExtendedTupleOps<A,B> for (~[A], ~[B]) {
#[inline(always)]
fn zip(&self) -> ~[(A, B)] {
// FIXME #4898: impl for one-tuples
#[cfg(notest)]
-impl<A: Eq, B: Eq> Eq for (A, B) {
+impl<A:Eq,B:Eq> Eq for (A, B) {
#[inline(always)]
pure fn eq(&self, other: &(A, B)) -> bool {
match (*self) {
}
#[cfg(notest)]
-impl<A: Ord, B: Ord> Ord for (A, B) {
+impl<A:Ord,B:Ord> Ord for (A, B) {
#[inline(always)]
pure fn lt(&self, other: &(A, B)) -> bool {
match (*self) {
}
#[cfg(notest)]
-impl<A: Eq, B: Eq, C: Eq> Eq for (A, B, C) {
+impl<A:Eq,B:Eq,C:Eq> Eq for (A, B, C) {
#[inline(always)]
pure fn eq(&self, other: &(A, B, C)) -> bool {
match (*self) {
}
#[cfg(notest)]
-impl<A: Ord, B: Ord, C: Ord> Ord for (A, B, C) {
+impl<A:Ord,B:Ord,C:Ord> Ord for (A, B, C) {
#[inline(always)]
pure fn lt(&self, other: &(A, B, C)) -> bool {
match (*self) {
/// Sets `*ptr` to `new_value`, invokes `op()`, and then restores the
/// original value of `*ptr`.
#[inline(always)]
-pub fn with<T: Copy, R>(
+pub fn with<T:Copy,R>(
ptr: &mut T,
new_value: T,
op: &fn() -> R) -> R
* Creates an immutable vector of size `n_elts` and initializes the elements
* to the value `t`.
*/
-pub pure fn from_elem<T: Copy>(n_elts: uint, t: T) -> ~[T] {
+pub pure fn from_elem<T:Copy>(n_elts: uint, t: T) -> ~[T] {
from_fn(n_elts, |_i| copy t)
}
/// Creates a new unique vector with the same contents as the slice
-pub pure fn from_slice<T: Copy>(t: &[T]) -> ~[T] {
+pub pure fn from_slice<T:Copy>(t: &[T]) -> ~[T] {
from_fn(t.len(), |i| t[i])
}
// Accessors
/// Returns the first element of a vector
-pub pure fn head<T: Copy>(v: &[const T]) -> T { v[0] }
+pub pure fn head<T:Copy>(v: &[const T]) -> T { v[0] }
/// Returns a vector containing all but the first element of a slice
-pub pure fn tail<T: Copy>(v: &[const T]) -> ~[T] {
+pub pure fn tail<T:Copy>(v: &[const T]) -> ~[T] {
slice(v, 1u, len(v)).to_vec()
}
* Returns a vector containing all but the first `n` \
* elements of a slice
*/
-pub pure fn tailn<T: Copy>(v: &[const T], n: uint) -> ~[T] {
+pub pure fn tailn<T:Copy>(v: &[const T], n: uint) -> ~[T] {
slice(v, n, len(v)).to_vec()
}
/// Returns a vector containing all but the last element of a slice
-pub pure fn init<T: Copy>(v: &[const T]) -> ~[T] {
+pub pure fn init<T:Copy>(v: &[const T]) -> ~[T] {
assert len(v) != 0u;
slice(v, 0u, len(v) - 1u).to_vec()
}
/// Returns the last element of the slice `v`, failing if the slice is empty.
-pub pure fn last<T: Copy>(v: &[const T]) -> T {
+pub pure fn last<T:Copy>(v: &[const T]) -> T {
if len(v) == 0u { fail!(~"last_unsafe: empty vector") }
v[len(v) - 1u]
}
* Returns `Some(x)` where `x` is the last element of the slice `v`,
* or `none` if the vector is empty.
*/
-pub pure fn last_opt<T: Copy>(v: &[const T]) -> Option<T> {
+pub pure fn last_opt<T:Copy>(v: &[const T]) -> Option<T> {
if len(v) == 0u { return None; }
Some(v[len(v) - 1u])
}
/// Copies
/// Split the vector `v` by applying each element against the predicate `f`.
-pub fn split<T: Copy>(v: &[T], f: fn(t: &T) -> bool) -> ~[~[T]] {
+pub fn split<T:Copy>(v: &[T], f: fn(t: &T) -> bool) -> ~[~[T]] {
let ln = len(v);
if (ln == 0u) { return ~[] }
* Split the vector `v` by applying each element against the predicate `f` up
* to `n` times.
*/
-pub fn splitn<T: Copy>(v: &[T], n: uint, f: fn(t: &T) -> bool) -> ~[~[T]] {
+pub fn splitn<T:Copy>(v: &[T], n: uint, f: fn(t: &T) -> bool) -> ~[~[T]] {
let ln = len(v);
if (ln == 0u) { return ~[] }
* Reverse split the vector `v` by applying each element against the predicate
* `f`.
*/
-pub fn rsplit<T: Copy>(v: &[T], f: fn(t: &T) -> bool) -> ~[~[T]] {
+pub fn rsplit<T:Copy>(v: &[T], f: fn(t: &T) -> bool) -> ~[~[T]] {
let ln = len(v);
if (ln == 0) { return ~[] }
* Reverse split the vector `v` by applying each element against the predicate
* `f` up to `n times.
*/
-pub fn rsplitn<T: Copy>(v: &[T], n: uint, f: fn(t: &T) -> bool) -> ~[~[T]] {
+pub fn rsplitn<T:Copy>(v: &[T], n: uint, f: fn(t: &T) -> bool) -> ~[~[T]] {
let ln = len(v);
if (ln == 0u) { return ~[] }
* Partitions a vector into two new vectors: those that satisfies the
* predicate, and those that do not.
*/
-pub pure fn partitioned<T: Copy>(v: &[T], f: fn(&T) -> bool) -> (~[T], ~[T]) {
+pub pure fn partitioned<T:Copy>(v: &[T], f: fn(&T) -> bool) -> (~[T], ~[T]) {
let mut lefts = ~[];
let mut rights = ~[];
}
#[inline(always)]
-pub fn push_all<T: Copy>(v: &mut ~[T], rhs: &[const T]) {
+pub fn push_all<T:Copy>(v: &mut ~[T], rhs: &[const T]) {
let new_len = v.len() + rhs.len();
reserve(&mut *v, new_len);
* Remove consecutive repeated elements from a vector; if the vector is
* sorted, this removes all duplicates.
*/
-pub fn dedup<T: Eq>(v: &mut ~[T]) {
+pub fn dedup<T:Eq>(v: &mut ~[T]) {
unsafe {
if v.len() < 1 { return; }
let mut last_written = 0, next_to_read = 1;
// Appending
#[inline(always)]
-pub pure fn append<T: Copy>(lhs: ~[T], rhs: &[const T]) -> ~[T] {
+pub pure fn append<T:Copy>(lhs: ~[T], rhs: &[const T]) -> ~[T] {
let mut v = lhs;
unsafe {
v.push_all(rhs);
* * n - The number of elements to add
* * initval - The value for the new elements
*/
-pub fn grow<T: Copy>(v: &mut ~[T], n: uint, initval: &T) {
+pub fn grow<T:Copy>(v: &mut ~[T], n: uint, initval: &T) {
let new_len = v.len() + n;
reserve_at_least(&mut *v, new_len);
let mut i: uint = 0u;
* of the vector, expands the vector by replicating `initval` to fill the
* intervening space.
*/
-pub fn grow_set<T: Copy>(v: &mut ~[T], index: uint, initval: &T, val: T) {
+pub fn grow_set<T:Copy>(v: &mut ~[T], index: uint, initval: &T, val: T) {
let l = v.len();
if index >= l { grow(&mut *v, index - l + 1u, initval); }
v[index] = val;
}
/// Apply a function to each pair of elements and return the results
-pub pure fn map2<T: Copy, U: Copy, V>(v0: &[T], v1: &[U],
+pub pure fn map2<T:Copy,U:Copy,V>(v0: &[T], v1: &[U],
f: fn(t: &T, v: &U) -> V) -> ~[V] {
let v0_len = len(v0);
if v0_len != len(v1) { fail!(); }
* Apply function `f` to each element of `v` and return a vector containing
* only those elements for which `f` returned true.
*/
-pub pure fn filtered<T: Copy>(v: &[T], f: fn(t: &T) -> bool) -> ~[T] {
+pub pure fn filtered<T:Copy>(v: &[T], f: fn(t: &T) -> bool) -> ~[T] {
let mut result = ~[];
for each(v) |elem| {
if f(elem) { unsafe { result.push(*elem); } }
*
* Flattens a vector of vectors of T into a single vector of T.
*/
-pub pure fn concat<T: Copy>(v: &[~[T]]) -> ~[T] {
+pub pure fn concat<T:Copy>(v: &[~[T]]) -> ~[T] {
let mut r = ~[];
for each(v) |inner| { unsafe { r.push_all(*inner); } }
r
}
/// Concatenate a vector of vectors, placing a given separator between each
-pub pure fn connect<T: Copy>(v: &[~[T]], sep: &T) -> ~[T] {
+pub pure fn connect<T:Copy>(v: &[~[T]], sep: &T) -> ~[T] {
let mut r: ~[T] = ~[];
let mut first = true;
for each(v) |inner| {
}
/// Return true if a vector contains an element with the given value
-pub pure fn contains<T: Eq>(v: &[T], x: &T) -> bool {
+pub pure fn contains<T:Eq>(v: &[T], x: &T) -> bool {
for each(v) |elt| { if *x == *elt { return true; } }
return false;
}
/// Returns the number of elements that are equal to a given value
-pub pure fn count<T: Eq>(v: &[T], x: &T) -> uint {
+pub pure fn count<T:Eq>(v: &[T], x: &T) -> uint {
let mut cnt = 0u;
for each(v) |elt| { if *x == *elt { cnt += 1u; } }
return cnt;
* When function `f` returns true then an option containing the element
* is returned. If `f` matches no elements then none is returned.
*/
-pub pure fn find<T: Copy>(v: &[T], f: fn(t: &T) -> bool) -> Option<T> {
+pub pure fn find<T:Copy>(v: &[T], f: fn(t: &T) -> bool) -> Option<T> {
find_between(v, 0u, len(v), f)
}
* [`start`, `end`). When function `f` returns true then an option containing
* the element is returned. If `f` matches no elements then none is returned.
*/
-pub pure fn find_between<T: Copy>(v: &[T], start: uint, end: uint,
+pub pure fn find_between<T:Copy>(v: &[T], start: uint, end: uint,
f: fn(t: &T) -> bool) -> Option<T> {
position_between(v, start, end, f).map(|i| v[*i])
}
* `f` returns true then an option containing the element is returned. If `f`
* matches no elements then none is returned.
*/
-pub pure fn rfind<T: Copy>(v: &[T], f: fn(t: &T) -> bool) -> Option<T> {
+pub pure fn rfind<T:Copy>(v: &[T], f: fn(t: &T) -> bool) -> Option<T> {
rfind_between(v, 0u, len(v), f)
}
* [`start`, `end`). When function `f` returns true then an option containing
* the element is returned. If `f` matches no elements then none is return.
*/
-pub pure fn rfind_between<T: Copy>(v: &[T], start: uint, end: uint,
+pub pure fn rfind_between<T:Copy>(v: &[T], start: uint, end: uint,
f: fn(t: &T) -> bool) -> Option<T> {
rposition_between(v, start, end, f).map(|i| v[*i])
}
/// Find the first index containing a matching value
-pub pure fn position_elem<T: Eq>(v: &[T], x: &T) -> Option<uint> {
+pub pure fn position_elem<T:Eq>(v: &[T], x: &T) -> Option<uint> {
position(v, |y| *x == *y)
}
}
/// Find the last index containing a matching value
-pure fn rposition_elem<T: Eq>(v: &[T], x: &T) -> Option<uint> {
+pure fn rposition_elem<T:Eq>(v: &[T], x: &T) -> Option<uint> {
rposition(v, |y| *x == *y)
}
/**
* Convert a vector of pairs into a pair of vectors, by reference. As unzip().
*/
-pure fn unzip_slice<T: Copy, U: Copy>(v: &[(T, U)]) -> (~[T], ~[U]) {
+pure fn unzip_slice<T:Copy,U:Copy>(v: &[(T, U)]) -> (~[T], ~[U]) {
let mut ts = ~[], us = ~[];
for each(v) |p| {
let (t, u) = *p;
/**
* Convert two vectors to a vector of pairs, by reference. As zip().
*/
-pub pure fn zip_slice<T: Copy, U: Copy>(v: &[const T], u: &[const U])
+pub pure fn zip_slice<T:Copy,U:Copy>(v: &[const T], u: &[const U])
-> ~[(T, U)] {
let mut zipped = ~[];
let sz = len(v);
}
/// Returns a vector with the order of elements reversed
-pub pure fn reversed<T: Copy>(v: &[const T]) -> ~[T] {
+pub pure fn reversed<T:Copy>(v: &[const T]) -> ~[T] {
let mut rs: ~[T] = ~[];
let mut i = len::<T>(v);
if i == 0 { return (rs); } else { i -= 1; }
* The total number of permutations produced is `len(v)!`. If `v` contains
* repeated elements, then some permutations are repeated.
*/
-pure fn each_permutation<T: Copy>(v: &[T], put: fn(ts: &[T]) -> bool) {
+pure fn each_permutation<T:Copy>(v: &[T], put: fn(ts: &[T]) -> bool) {
let ln = len(v);
if ln <= 1 {
put(v);
}
}
-pub pure fn windowed<TT: Copy>(nn: uint, xx: &[TT]) -> ~[~[TT]] {
+pub pure fn windowed<TT:Copy>(nn: uint, xx: &[TT]) -> ~[~[TT]] {
let mut ww = ~[];
assert 1u <= nn;
for vec::eachi (xx) |ii, _x| {
// Equality
-pure fn eq<T: Eq>(a: &[T], b: &[T]) -> bool {
+pure fn eq<T:Eq>(a: &[T], b: &[T]) -> bool {
let (a_len, b_len) = (a.len(), b.len());
if a_len != b_len { return false; }
}
#[cfg(notest)]
-impl<T: Eq> Eq for &[T] {
+impl<T:Eq> Eq for &[T] {
#[inline(always)]
pure fn eq(&self, other: & &self/[T]) -> bool { eq((*self), (*other)) }
#[inline(always)]
#[cfg(notest)]
-impl<T: Eq> Eq for ~[T] {
+impl<T:Eq> Eq for ~[T] {
#[inline(always)]
pure fn eq(&self, other: &~[T]) -> bool { eq((*self), (*other)) }
#[inline(always)]
}
#[cfg(notest)]
-impl<T: Eq> Eq for @[T] {
+impl<T:Eq> Eq for @[T] {
#[inline(always)]
pure fn eq(&self, other: &@[T]) -> bool { eq((*self), (*other)) }
#[inline(always)]
// Lexicographical comparison
-pure fn lt<T: Ord>(a: &[T], b: &[T]) -> bool {
+pure fn lt<T:Ord>(a: &[T], b: &[T]) -> bool {
let (a_len, b_len) = (a.len(), b.len());
let mut end = uint::min(a_len, b_len);
return a_len < b_len;
}
-pure fn le<T: Ord>(a: &[T], b: &[T]) -> bool { !lt(b, a) }
-pure fn ge<T: Ord>(a: &[T], b: &[T]) -> bool { !lt(a, b) }
-pure fn gt<T: Ord>(a: &[T], b: &[T]) -> bool { lt(b, a) }
+pure fn le<T:Ord>(a: &[T], b: &[T]) -> bool { !lt(b, a) }
+pure fn ge<T:Ord>(a: &[T], b: &[T]) -> bool { !lt(a, b) }
+pure fn gt<T:Ord>(a: &[T], b: &[T]) -> bool { lt(b, a) }
#[cfg(notest)]
-impl<T: Ord> Ord for &[T] {
+impl<T:Ord> Ord for &[T] {
#[inline(always)]
pure fn lt(&self, other: & &self/[T]) -> bool { lt((*self), (*other)) }
#[inline(always)]
}
#[cfg(notest)]
-impl<T: Ord> Ord for ~[T] {
+impl<T:Ord> Ord for ~[T] {
#[inline(always)]
pure fn lt(&self, other: &~[T]) -> bool { lt((*self), (*other)) }
#[inline(always)]
}
#[cfg(notest)]
-impl<T: Ord> Ord for @[T] {
+impl<T:Ord> Ord for @[T] {
#[inline(always)]
pure fn lt(&self, other: &@[T]) -> bool { lt((*self), (*other)) }
#[inline(always)]
use ops::Add;
use vec::append;
- impl<T: Copy> Add<&[const T],~[T]> for ~[T] {
+ impl<T:Copy> Add<&[const T],~[T]> for ~[T] {
#[inline(always)]
pure fn add(&self, rhs: & &self/[const T]) -> ~[T] {
append(copy *self, (*rhs))
}
/// Extension methods for vectors
-impl<T: Copy> CopyableVector<T> for &[const T] {
+impl<T:Copy> CopyableVector<T> for &[const T] {
/// Returns the first element of a vector
#[inline]
pure fn head(&self) -> T { head(*self) }
pub trait ImmutableVector<T> {
pure fn view(&self, start: uint, end: uint) -> &self/[T];
- pure fn foldr<U: Copy>(&self, z: U, p: fn(t: &T, u: U) -> U) -> U;
+ pure fn foldr<U:Copy>(&self, z: U, p: fn(t: &T, u: U) -> U) -> U;
pure fn map<U>(&self, f: fn(t: &T) -> U) -> ~[U];
pure fn mapi<U>(&self, f: fn(uint, t: &T) -> U) -> ~[U];
fn map_r<U>(&self, f: fn(x: &T) -> U) -> ~[U];
pure fn alli(&self, f: fn(uint, t: &T) -> bool) -> bool;
pure fn flat_map<U>(&self, f: fn(t: &T) -> ~[U]) -> ~[U];
- pure fn filter_mapped<U: Copy>(&self, f: fn(t: &T) -> Option<U>) -> ~[U];
+ pure fn filter_mapped<U:Copy>(&self, f: fn(t: &T) -> Option<U>) -> ~[U];
}
/// Extension methods for vectors
/// Reduce a vector from right to left
#[inline]
- pure fn foldr<U: Copy>(&self, z: U, p: fn(t: &T, u: U) -> U) -> U {
+ pure fn foldr<U:Copy>(&self, z: U, p: fn(t: &T, u: U) -> U) -> U {
foldr(*self, z, p)
}
* the resulting vector.
*/
#[inline]
- pure fn filter_mapped<U: Copy>(&self, f: fn(t: &T) -> Option<U>) -> ~[U] {
+ pure fn filter_mapped<U:Copy>(&self, f: fn(t: &T) -> Option<U>) -> ~[U] {
filter_mapped(*self, f)
}
}
-pub trait ImmutableEqVector<T: Eq> {
+pub trait ImmutableEqVector<T:Eq> {
pure fn position(&self, f: fn(t: &T) -> bool) -> Option<uint>;
pure fn position_elem(&self, t: &T) -> Option<uint>;
pure fn rposition(&self, f: fn(t: &T) -> bool) -> Option<uint>;
pure fn rposition_elem(&self, t: &T) -> Option<uint>;
}
-impl<T: Eq> ImmutableEqVector<T> for &[T] {
+impl<T:Eq> ImmutableEqVector<T> for &[T] {
/**
* Find the first index matching some predicate
*
}
/// Extension methods for vectors
-impl<T: Copy> ImmutableCopyableVector<T> for &[T] {
+impl<T:Copy> ImmutableCopyableVector<T> for &[T] {
/**
* Construct a new vector from the elements of a vector for which some
* predicate holds.
fn clear(&mut self) { self.truncate(0) }
}
-pub trait OwnedCopyableVector<T: Copy> {
+pub trait OwnedCopyableVector<T:Copy> {
fn push_all(&mut self, rhs: &[const T]);
fn grow(&mut self, n: uint, initval: &T);
fn grow_set(&mut self, index: uint, initval: &T, val: T);
}
-impl<T: Copy> OwnedCopyableVector<T> for ~[T] {
+impl<T:Copy> OwnedCopyableVector<T> for ~[T] {
#[inline]
fn push_all(&mut self, rhs: &[const T]) {
push_all(self, rhs);
}
}
-trait OwnedEqVector<T: Eq> {
+trait OwnedEqVector<T:Eq> {
fn dedup(&mut self);
}
-impl<T: Eq> OwnedEqVector<T> for ~[T] {
+impl<T:Eq> OwnedEqVector<T> for ~[T] {
#[inline]
fn dedup(&mut self) {
dedup(self)
* Unchecked vector indexing.
*/
#[inline(always)]
- pub unsafe fn get<T: Copy>(v: &[const T], i: uint) -> T {
+ pub unsafe fn get<T:Copy>(v: &[const T], i: uint) -> T {
as_const_buf(v, |p, _len| *ptr::const_offset(p, i))
}
}
}
-impl<A:
Eq> iter::EqIter<A> for &[A] {
+impl<A:Eq> iter::EqIter<A> for &[A] {
pub pure fn contains(&self, x: &A) -> bool { iter::contains(self, x) }
pub pure fn count(&self, x: &A) -> uint { iter::count(self, x) }
}
// FIXME(#4148): This should be redundant
-impl<A:
Eq> iter::EqIter<A> for ~[A] {
+impl<A:Eq> iter::EqIter<A> for ~[A] {
pub pure fn contains(&self, x: &A) -> bool { iter::contains(self, x) }
pub pure fn count(&self, x: &A) -> uint { iter::count(self, x) }
}
// FIXME(#4148): This should be redundant
-impl<A:
Eq> iter::EqIter<A> for @[A] {
+impl<A:Eq> iter::EqIter<A> for @[A] {
pub pure fn contains(&self, x: &A) -> bool { iter::contains(self, x) }
pub pure fn count(&self, x: &A) -> uint { iter::count(self, x) }
}
-impl<A:
Copy> iter::CopyableIter<A> for &[A] {
+impl<A:Copy> iter::CopyableIter<A> for &[A] {
pure fn filter_to_vec(&self, pred: fn(&A) -> bool) -> ~[A] {
iter::filter_to_vec(self, pred)
}
}
// FIXME(#4148): This should be redundant
-impl<A:
Copy> iter::CopyableIter<A> for ~[A] {
+impl<A:Copy> iter::CopyableIter<A> for ~[A] {
pure fn filter_to_vec(&self, pred: fn(&A) -> bool) -> ~[A] {
iter::filter_to_vec(self, pred)
}
}
// FIXME(#4148): This should be redundant
-impl<A:
Copy> iter::CopyableIter<A> for @[A] {
+impl<A:Copy> iter::CopyableIter<A> for @[A] {
pure fn filter_to_vec(&self, pred: fn(&A) -> bool) -> ~[A] {
iter::filter_to_vec(self, pred)
}
}
}
-impl<A:
Copy Ord> iter::CopyableOrderedIter<A> for &[A] {
+impl<A:
Copy + Ord> iter::CopyableOrderedIter<A> for &[A] {
pure fn min(&self) -> A { iter::min(self) }
pure fn max(&self) -> A { iter::max(self) }
}
// FIXME(#4148): This should be redundant
-impl<A:
Copy Ord> iter::CopyableOrderedIter<A> for ~[A] {
+impl<A:
Copy + Ord> iter::CopyableOrderedIter<A> for ~[A] {
pure fn min(&self) -> A { iter::min(self) }
pure fn max(&self) -> A { iter::max(self) }
}
// FIXME(#4148): This should be redundant
-impl<A:
Copy Ord> iter::CopyableOrderedIter<A> for @[A] {
+impl<A:
Copy + Ord> iter::CopyableOrderedIter<A> for @[A] {
pure fn min(&self) -> A { iter::min(self) }
pure fn max(&self) -> A { iter::max(self) }
}
}
// random choice from a vec
-fn choice<T: copy>(r : rand::rng, v : ~[const T]) -> T {
+fn choice<T:copy>(r : rand::rng, v : ~[const T]) -> T {
assert vec::len(v) != 0u; v[under(r, vec::len(v))]
}
use vec::slice;
use vec::len;
-fn vec_omit<T: copy>(v: ~[T], i: uint) -> ~[T] {
+fn vec_omit<T:copy>(v: ~[T], i: uint) -> ~[T] {
slice(v, 0u, i) + slice(v, i + 1u, len(v))
}
-fn vec_dup<T: copy>(v: ~[T], i: uint) -> ~[T] {
+fn vec_dup<T:copy>(v: ~[T], i: uint) -> ~[T] {
slice(v, 0u, i) + [v[i]] + slice(v, i, len(v))
}
-fn vec_swadj<T: copy>(v: ~[T], i: uint) -> ~[T] {
+fn vec_swadj<T:copy>(v: ~[T], i: uint) -> ~[T] {
slice(v, 0u, i) + [v[i + 1u], v[i]] + slice(v, i + 2u, len(v))
}
-fn vec_prefix<T: copy>(v: ~[T], i: uint) -> ~[T] { slice(v, 0u, i) }
-fn vec_suffix<T: copy>(v: ~[T], i: uint) -> ~[T] { slice(v, i, len(v)) }
+fn vec_prefix<T:copy>(v: ~[T], i: uint) -> ~[T] { slice(v, 0u, i) }
+fn vec_suffix<T:copy>(v: ~[T], i: uint) -> ~[T] { slice(v, i, len(v)) }
-fn vec_poke<T: copy>(v: ~[T], i: uint, x: T) -> ~[T] {
+fn vec_poke<T:copy>(v: ~[T], i: uint, x: T) -> ~[T] {
slice(v, 0u, i) + ~[x] + slice(v, i + 1u, len(v))
}
-fn vec_insert<T: copy>(v: ~[T], i: uint, x: T) -> ~[T] {
+fn vec_insert<T:copy>(v: ~[T], i: uint, x: T) -> ~[T] {
slice(v, 0u, i) + ~[x] + slice(v, i, len(v))
}
// Returns a bunch of modified versions of v, some of which introduce
// new elements (borrowed from xs).
-fn vec_edits<T: copy>(v: ~[T], xs: ~[T]) -> ~[~[T]] {
+fn vec_edits<T:copy>(v: ~[T], xs: ~[T]) -> ~[~[T]] {
let edits: ~[~[T]] = ~[];
let Lv: uint = len(v);
}
// random choice from a vec
-fn choice<T: copy>(r : rand::rng, v : ~[T]) -> T {
+fn choice<T:copy>(r : rand::rng, v : ~[T]) -> T {
assert vec::len(v) != 0u; v[under(r, vec::len(v))]
}
}
// create a shuffled copy of a vec
-fn shuffled<T: copy>(r : rand::rng, v : ~[T]) -> ~[T] {
+fn shuffled<T:copy>(r : rand::rng, v : ~[T]) -> ~[T] {
let w = vec::to_mut(v);
shuffle(r, w);
vec::from_mut(w) // Shouldn't this happen automatically?
// * 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: copy>(r : rand::rng, v : ~[weighted<T>]) -> T {
+fn weighted_choice<T:copy>(r : rand::rng, v : ~[weighted<T>]) -> T {
assert vec::len(v) != 0u;
let total = 0u;
for {weight: weight, item: _} in v {
core::unreachable();
}
-fn weighted_vec<T: copy>(v : ~[weighted<T>]) -> ~[T] {
+fn weighted_vec<T:copy>(v : ~[weighted<T>]) -> ~[T] {
let r = ~[];
for {weight: weight, item: item} in v {
let i = 0u;
}
// Seems out of place, but it uses session, so I'm putting it here
-pub fn expect<T: Copy>(sess: Session,
+pub fn expect<T:Copy>(sess: Session,
opt: Option<T>,
msg: fn() -> ~str)
-> T {
fn inject_libcore_ref(sess: Session,
crate: @ast::crate) -> @ast::crate {
- fn spanned<T: Copy>(x: T) -> codemap::spanned<T> {
+ fn spanned<T:Copy>(x: T) -> codemap::spanned<T> {
codemap::spanned { node: x, span: dummy_sp() }
}
return @item;
}
-fn nospan<T: Copy>(t: T) -> codemap::spanned<T> {
+fn nospan<T:Copy>(t: T) -> codemap::spanned<T> {
codemap::spanned { node: t, span: dummy_sp() }
}
// Path and definition ID indexing
-fn create_index<T: Copy Hash IterBytes>(index: ~[entry<T>]) ->
+fn create_index<T:Copy + Hash + IterBytes>(index: ~[entry<T>]) ->
~[@~[entry<T>]] {
let mut buckets: ~[@mut ~[entry<T>]] = ~[];
for uint::range(0u, 256u) |_i| { buckets.push(@mut ~[]); };
} as FileSearch
}
-pub fn search<T: Copy>(filesearch: FileSearch, pick: pick<T>) -> Option<T> {
+pub fn search<T:Copy>(filesearch: FileSearch, pick: pick<T>) -> Option<T> {
let mut rslt = None;
for filesearch.lib_search_paths().each |lib_search_path| {
debug!("searching %s", lib_search_path.to_str());
fn emit_def_id(did: ast::def_id);
}
-impl<S: serialize::Encoder> def_id_encoder_helpers for S {
+impl<S:serialize::Encoder> def_id_encoder_helpers for S {
fn emit_def_id(did: ast::def_id) {
did.encode(&self)
}
fn read_def_id(xcx: @ExtendedDecodeContext) -> ast::def_id;
}
-impl<D: serialize::Decoder> def_id_decoder_helpers for D {
+impl<D:serialize::Decoder> def_id_decoder_helpers for D {
fn read_def_id(xcx: @ExtendedDecodeContext) -> ast::def_id {
let did: ast::def_id = Decodable::decode(&self);
fn test_simplification() {
let ext_cx = mk_ctxt();
let item_in = ast::ii_item(quote_item!(
- 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: ~[]};
}
).get());
let item_out = simplify_ast(item_in);
let item_exp = ast::ii_item(quote_item!(
- fn new_int_alist<B: Copy>() -> alist<int, B> {
+ fn new_int_alist<B:Copy>() -> alist<int, B> {
return {eq_fn: eq_int, data: ~[]};
}
).get());
cat_def(self.tcx, self.method_map, id, span, ty, def)
}
- fn cat_variant<N: ast_node>(&self,
+ fn cat_variant<N:ast_node>(&self,
arg: N,
enum_did: ast::def_id,
cmt: cmt) -> cmt {
}
fn check_item_type_limits(cx: ty::ctxt, it: @ast::item) {
- pure fn is_valid<T: cmp::Ord>(binop: ast::binop, v: T,
+ pure fn is_valid<T:cmp::Ord>(binop: ast::binop, v: T,
min: T, max: T) -> bool {
match binop {
ast::lt => v <= max,
return mcx.cat_def(expr_id, expr_span, expr_ty, def);
}
-pub fn cat_variant<N: ast_node>(
+pub fn cat_variant<N:ast_node>(
tcx: ty::ctxt,
method_map: typeck::method_map,
arg: N,
}
pub trait get_type_for_node {
- fn ty<N: ast_node>(node: N) -> ty::t;
+ fn ty<N:ast_node>(node: N) -> ty::t;
}
pub impl get_type_for_node for ty::ctxt {
- fn ty<N: ast_node>(node: N) -> ty::t {
+ fn ty<N:ast_node>(node: N) -> ty::t {
ty::node_id_to_type(self, node.id())
}
}
}
}
- fn cat_variant<N: ast_node>(&self,
+ fn cat_variant<N:ast_node>(&self,
arg: N,
enum_did: ast::def_id,
cmt: cmt) -> cmt {
}
}
- fn cat_rvalue<N: ast_node>(&self, elt: N, expr_ty: ty::t) -> cmt {
+ fn cat_rvalue<N:ast_node>(&self, elt: N, expr_ty: ty::t) -> cmt {
@cmt_ {
id:elt.id(),
span:elt.span(),
}
}
- fn cat_index<N: ast_node>(&self,
+ fn cat_index<N:ast_node>(&self,
elt: N,
base_cmt: cmt) -> cmt {
let mt = match ty::index(self.tcx, base_cmt.ty) {
}
};
- fn comp<N: ast_node>(elt: N, of_cmt: cmt,
+ fn comp<N:ast_node>(elt: N, of_cmt: cmt,
vect: ty::t, mutbl: MutabilityCategory,
mt: ty::mt) -> cmt
{
}
}
- fn cat_tuple_elt<N: ast_node>(&self,
+ fn cat_tuple_elt<N:ast_node>(&self,
elt: N,
cmt: cmt) -> cmt {
@cmt_ {
}
}
- fn cat_anon_struct_field<N: ast_node>(&self,
+ fn cat_anon_struct_field<N:ast_node>(&self,
elt: N,
cmt: cmt) -> cmt {
@cmt_ {
retval_metadata(@Metadata<RetvalMetadata>),
}
-fn cast_safely<T: Copy, U>(val: T) -> U {
+fn cast_safely<T:Copy,U>(val: T) -> U {
unsafe {
let val2 = val;
return cast::transmute(val2);
}
}
-fn cached_metadata<T: Copy>(cache: metadata_cache,
+fn cached_metadata<T:Copy>(cache: metadata_cache,
mdtag: int,
eq_fn: fn(md: T) -> bool)
-> Option<T> {
return oldmap::HashMap();
}
-pub fn new_ty_hash<V: Copy>() -> oldmap::HashMap<t, V> {
+pub fn new_ty_hash<V:Copy>() -> oldmap::HashMap<t, V> {
oldmap::HashMap()
}
// Maintains a little union-set tree for inferred modes. `canon()` returns
// the current head value for `m0`.
-fn canon<T:Copy cmp::Eq>(tbl: HashMap<ast::node_id, ast::inferable<T>>,
+fn canon<T:Copy
+ cmp::Eq>(tbl: HashMap<ast::node_id, ast::inferable<T>>,
+m0: ast::inferable<T>) -> ast::inferable<T> {
match m0 {
ast::infer(id) => match tbl.find(&id) {
}
}
-pub fn ast_region_to_region<AC: AstConv, RS: region_scope Copy Durable>(
+pub fn ast_region_to_region<AC:AstConv,RS:region_scope + Copy + Durable>(
self: @mut AC,
rscope: RS,
span: span,
get_region_reporting_err(self.tcx(), span, res)
}
-pub fn ast_path_to_substs_and_ty<AC: AstConv, RS: region_scope Copy Durable>(
+pub fn ast_path_to_substs_and_ty<AC:AstConv,RS:region_scope + Copy + Durable>(
self: @mut AC,
rscope: RS,
did: ast::def_id,
ty_param_substs_and_ty { substs: substs, ty: ty }
}
-pub fn ast_path_to_ty<AC: AstConv, RS: region_scope Copy Durable>(
+pub fn ast_path_to_ty<AC:AstConv,RS:region_scope + Copy + Durable>(
self: @mut AC,
rscope: RS,
did: ast::def_id,
// Parses the programmer's textual representation of a type into our
// internal notion of a type. `getter` is a function that returns the type
// corresponding to a definition ID:
-pub fn ast_ty_to_ty<AC: AstConv, RS: region_scope Copy Durable>(
+pub fn ast_ty_to_ty<AC:AstConv,RS:region_scope + Copy + Durable>(
self: @mut AC, rscope: RS, &&ast_ty: @ast::Ty) -> ty::t {
- fn ast_mt_to_mt<AC: AstConv, RS: region_scope Copy Durable>(
+ fn ast_mt_to_mt<AC:AstConv,RS:region_scope + Copy + Durable>(
self: @mut AC, rscope: RS, mt: ast::mt) -> ty::mt {
ty::mt {ty: ast_ty_to_ty(self, rscope, mt.ty), mutbl: mt.mutbl}
// Handle @, ~, and & being able to mean estrs and evecs.
// If a_seq_ty is a str or a vec, make it an estr/evec.
// Also handle function sigils and first-class trait types.
- fn mk_pointer<AC: AstConv, RS: region_scope Copy Durable>(
+ fn mk_pointer<AC:AstConv,RS:region_scope + Copy + Durable>(
self: @mut AC,
rscope: RS,
a_seq_ty: ast::mt,
return typ;
}
-pub fn ty_of_arg<AC: AstConv, RS: region_scope Copy Durable>(
+pub fn ty_of_arg<AC:AstConv,RS:region_scope + Copy + Durable>(
self: @mut AC,
rscope: RS,
a: ast::arg,
arg {mode: mode, ty: ty}
}
-pub fn ty_of_bare_fn<AC: AstConv, RS: region_scope Copy Durable>(
+pub fn ty_of_bare_fn<AC:AstConv,RS:region_scope + Copy + Durable>(
self: @mut AC,
rscope: RS,
purity: ast::purity,
}
}
-pub fn ty_of_closure<AC: AstConv, RS: region_scope Copy Durable>(
+pub fn ty_of_closure<AC:AstConv,RS:region_scope + Copy + Durable>(
self: @mut AC,
rscope: RS,
sigil: ast::Sigil,
// through the `unpack` function. It there is no expected type or
// resolution is not possible (e.g., no constraints yet present), just
// returns `none`.
- fn unpack_expected<O: Copy>(fcx: @mut FnCtxt,
+ fn unpack_expected<O:Copy>(fcx: @mut FnCtxt,
expected: Option<ty::t>,
unpack: fn(&ty::sty) -> Option<O>)
-> Option<O> {
}
pub impl @mut CrateCtxt {
- fn to_ty<RS: region_scope Copy Durable>(rs: RS, ast_ty: @ast::Ty)
+ fn to_ty<RS:region_scope + Copy + Durable>(rs: RS, ast_ty: @ast::Ty)
-> ty::t {
ast_ty_to_ty(self, rs, ast_ty)
}
}
}
-pub fn super_sigils<C: Combine>(
+pub fn super_sigils<C:Combine>(
self: &C, p1: ast::Sigil, p2: ast::Sigil) -> cres<ast::Sigil> {
if p1 == p2 {
Ok(p1)
b_id, a_bounds, b_bounds, node_b.rank)
}
- fn merge_bnd<T:Copy InferStr LatticeValue>(
+ fn merge_bnd<T:Copy + InferStr + LatticeValue>(
&self,
a: &Bound<T>,
b: &Bound<T>,
uok()
}
- fn bnds<T:Copy InferStr LatticeValue>(
+ fn bnds<T:Copy + InferStr + LatticeValue>(
&self,
a: &Bound<T>,
b: &Bound<T>) -> ures
}
}
-pub fn super_lattice_tys<L:LatticeDir TyLatticeDir Combine>(
+pub fn super_lattice_tys<L:LatticeDir + TyLatticeDir + Combine>(
self: &L,
a: ty::t,
b: ty::t) -> cres<ty::t> {
// Random utility functions used by LUB/GLB when computing LUB/GLB of
// fn types
-pub fn var_ids<T: Combine>(self: &T, isr: isr_alist) -> ~[RegionVid] {
+pub fn var_ids<T:Combine>(self: &T, isr: isr_alist) -> ~[RegionVid] {
let mut result = ~[];
for list::each(isr) |pair| {
match pair.second() {
}
}
-fn new_ValsAndBindings<V:Copy, T:Copy>() -> ValsAndBindings<V, T> {
+fn new_ValsAndBindings<V:Copy,T:Copy>() -> ValsAndBindings<V, T> {
ValsAndBindings {
vals: oldsmallintmap::mk(),
bindings: ~[]
fn compare(t: T, f: fn() -> ty::type_err) -> cres<T>;
}
-impl<T:Copy Eq> CresCompare<T> for cres<T> {
+impl<T:Copy + Eq> CresCompare<T> for cres<T> {
fn compare(t: T, f: fn() -> ty::type_err) -> cres<T> {
do self.chain |s| {
if s == t {
Ok(())
}
-fn rollback_to<V:Copy Vid, T:Copy>(
+fn rollback_to<V:Copy + Vid,T:Copy>(
vb: &mut ValsAndBindings<V, T>,
len: uint)
{
}
}
-fn next_simple_var<V: Copy,T: Copy>(
+fn next_simple_var<V:Copy,T:Copy>(
+counter: &mut uint,
+bindings: &mut ValsAndBindings<V,Option<T>>)
-> uint {
}
}
-pub impl<V:Vid ToStr, T:InferStr> InferStr for VarValue<V, T> {
+pub impl<V:Vid + ToStr,T:InferStr> InferStr for VarValue<V, T> {
fn inf_str(&self, cx: &InferCtxt) -> ~str {
match *self {
Redirect(ref vid) => fmt!("Redirect(%s)", vid.to_str()),
}
}
- fn set<T:Copy InferStr, V:Copy Vid ToStr UnifyVid<T>>(
+ fn set<T:Copy + InferStr,V:Copy + Vid + ToStr + UnifyVid<T>>(
&mut self,
+vid: V,
+new_v: VarValue<V, T>) {
}
}
- fn unify<T:Copy InferStr, V:Copy Vid ToStr UnifyVid<T>>(
+ fn unify<T:Copy + InferStr,V:Copy + Vid + ToStr + UnifyVid<T>>(
&mut self,
node_a: &Node<V, T>,
node_b: &Node<V, T>) -> (V, uint)
static fn to_type_err(expected_found<Self>) -> ty::type_err;
}
-pub fn mk_err<T: SimplyUnifiable>(+a_is_expected: bool,
+pub fn mk_err<T:SimplyUnifiable>(+a_is_expected: bool,
+a_t: T,
+b_t: T) -> ures {
if a_is_expected {
vtable_static(ast::def_id, ~[ty::t], vtable_res),
/*
Dynamic vtable, comes from a parameter that has a bound on it:
- fn foo<T: quux, baz, bar>(a: T) -- a's vtable would have a
+ fn foo<T:quux,baz,bar>(a: T) -- a's vtable would have a
vtable_param origin
The first uint is the param number (identifying T in the example),
}
pub struct anon_rscope { anon: ty::Region, base: region_scope }
-pub fn in_anon_rscope<RS: region_scope Copy Durable>(self: RS, r: ty::Region)
- -> @anon_rscope {
- @anon_rscope { anon: r, base: self as region_scope }
+pub fn in_anon_rscope<RS:region_scope + Copy + Durable>(self: RS,
+ r: ty::Region)
+ -> @anon_rscope {
+ @anon_rscope {anon: r, base: self as region_scope}
}
pub impl region_scope for @anon_rscope {
pure fn anon_region(_span: span) -> Result<ty::Region, ~str> {
anon_bindings: uint,
}
-pub fn in_binding_rscope<RS: region_scope Copy Durable>(self: RS)
+pub fn in_binding_rscope<RS:region_scope + Copy + Durable>(self: RS)
-> @mut binding_rscope {
let base = self as region_scope;
@mut binding_rscope { base: base, anon_bindings: 0 }
fold_struct: FoldStruct<T>
}
-impl<T: Clone> Clone for Fold<T> {
+impl<T:Clone> Clone for Fold<T> {
fn clone(&self) -> Fold<T> {
Fold {
ctxt: self.ctxt.clone(),
}
}
-pub fn default_any_fold<T: Clone>(ctxt: T) -> Fold<T> {
+pub fn default_any_fold<T:Clone>(ctxt: T) -> Fold<T> {
mk_fold(
ctxt,
|f, d| default_seq_fold_doc(f, d),
)
}
-pub fn default_seq_fold<T: Clone>(ctxt: T) -> Fold<T> {
+pub fn default_seq_fold<T:Clone>(ctxt: T) -> Fold<T> {
mk_fold(
ctxt,
|f, d| default_seq_fold_doc(f, d),
)
}
-pub fn default_par_fold<T: Clone>(ctxt: T) -> Fold<T> {
+pub fn default_par_fold<T:Clone>(ctxt: T) -> Fold<T> {
mk_fold(
ctxt,
|f, d| default_seq_fold_doc(f, d),
op: T
}
-impl<T: Copy> Clone for NominalOp<T> {
+impl<T:Copy> Clone for NominalOp<T> {
fn clone(&self) -> NominalOp<T> { copy *self }
}
struct ARC<T> { x: SharedMutableState<T> }
/// Create an atomically reference counted wrapper.
-pub fn ARC<T: Const Owned>(data: T) -> ARC<T> {
+pub fn ARC<T:Const + Owned>(data: T) -> ARC<T> {
ARC { x: unsafe { shared_mutable_state(data) } }
}
* Access the underlying data in an atomically reference counted
* wrapper.
*/
-pub fn get<T: Const Owned>(rc: &a/ARC<T>) -> &a/T {
+pub fn get<T:Const + Owned>(rc: &a/ARC<T>) -> &a/T {
unsafe { get_shared_immutable_state(&rc.x) }
}
* object. However, one of the `arc` objects can be sent to another task,
* allowing them to share the underlying data.
*/
-pub fn clone<T: Const Owned>(rc: &ARC<T>) -> ARC<T> {
+pub fn clone<T:Const + Owned>(rc: &ARC<T>) -> ARC<T> {
ARC { x: unsafe { clone_shared_mutable_state(&rc.x) } }
}
* unwrap from a task that holds another reference to the same ARC; it is
* guaranteed to deadlock.
*/
-pub fn unwrap<T: Const Owned>(rc: ARC<T>) -> T {
+pub fn unwrap<T:Const + Owned>(rc: ARC<T>) -> T {
let ARC { x: x } = rc;
unsafe { unwrap_shared_mutable_state(x) }
}
-impl<T: Const Owned> Clone for ARC<T> {
+impl<T:Const + Owned> Clone for ARC<T> {
fn clone(&self) -> ARC<T> {
clone(self)
}
struct MutexARC<T> { x: SharedMutableState<MutexARCInner<T>> }
/// Create a mutex-protected ARC with the supplied data.
-pub fn MutexARC<T: Owned>(user_data: T) -> MutexARC<T> {
+pub fn MutexARC<T:Owned>(user_data: T) -> MutexARC<T> {
mutex_arc_with_condvars(user_data, 1)
}
/**
* Create a mutex-protected ARC with the supplied data and a specified number
* of condvars (as sync::mutex_with_condvars).
*/
-pub fn mutex_arc_with_condvars<T: Owned>(user_data: T,
+pub fn mutex_arc_with_condvars<T:Owned>(user_data: T,
num_condvars: uint) -> MutexARC<T> {
let data =
MutexARCInner { lock: mutex_with_condvars(num_condvars),
MutexARC { x: unsafe { shared_mutable_state(data) } }
}
-impl<T: Owned> Clone for MutexARC<T> {
+impl<T:Owned> Clone for MutexARC<T> {
/// Duplicate a mutex-protected ARC, as arc::clone.
fn clone(&self) -> MutexARC<T> {
// NB: Cloning the underlying mutex is not necessary. Its reference
}
}
-impl<T: Owned> &MutexARC<T> {
+impl<T:Owned> &MutexARC<T> {
/**
* Access the underlying mutable data with mutual exclusion from other
* Will additionally fail if another task has failed while accessing the arc.
*/
// FIXME(#3724) make this a by-move method on the arc
-pub fn unwrap_mutex_arc<T: Owned>(arc: MutexARC<T>) -> T {
+pub fn unwrap_mutex_arc<T:Owned>(arc: MutexARC<T>) -> T {
let MutexARC { x: x } = arc;
let inner = unsafe { unwrap_shared_mutable_state(x) };
let MutexARCInner { failed: failed, data: data, _ } = inner;
}
/// Create a reader/writer ARC with the supplied data.
-pub fn RWARC<T: Const Owned>(user_data: T) -> RWARC<T> {
+pub fn RWARC<T:Const + Owned>(user_data: T) -> RWARC<T> {
rw_arc_with_condvars(user_data, 1)
}
/**
* Create a reader/writer ARC with the supplied data and a specified number
* of condvars (as sync::rwlock_with_condvars).
*/
-pub fn rw_arc_with_condvars<T: Const Owned>(
+pub fn rw_arc_with_condvars<T:Const + Owned>(
user_data: T,
num_condvars: uint) -> RWARC<T>
{
RWARC { x: unsafe { shared_mutable_state(data) }, cant_nest: () }
}
-impl<T: Const Owned> RWARC<T> {
+impl<T:Const + Owned> RWARC<T> {
/// Duplicate a rwlock-protected ARC, as arc::clone.
fn clone(&self) -> RWARC<T> {
RWARC { x: unsafe { clone_shared_mutable_state(&self.x) },
}
-impl<T: Const Owned> &RWARC<T> {
+impl<T:Const + Owned> &RWARC<T> {
/**
* Access the underlying data mutably. Locks the rwlock in write mode;
* other readers and writers will block.
* in write mode.
*/
// FIXME(#3724) make this a by-move method on the arc
-pub fn unwrap_rw_arc<T: Const Owned>(arc: RWARC<T>) -> T {
+pub fn unwrap_rw_arc<T:Const + Owned>(arc: RWARC<T>) -> T {
let RWARC { x: x, _ } = arc;
let inner = unsafe { unwrap_shared_mutable_state(x) };
let RWARCInner { failed: failed, data: data, _ } = inner;
// lock it. This wraps the unsafety, with the justification that the 'lock'
// field is never overwritten; only 'failed' and 'data'.
#[doc(hidden)]
-fn borrow_rwlock<T: Const Owned>(state: *const RWARCInner<T>) -> *RWlock {
+fn borrow_rwlock<T:Const + Owned>(state: *const RWARCInner<T>) -> *RWlock {
unsafe { cast::transmute(&const (*state).lock) }
}
/// The "read permission" token used for RWARC.write_downgrade().
pub enum RWReadMode<T> = (&T, sync::RWlockReadMode);
-impl<T: Const Owned> &RWWriteMode<T> {
+impl<T:Const + Owned> &RWWriteMode<T> {
/// Access the pre-downgrade RWARC in write mode.
fn write<U>(blk: fn(x: &mut T) -> U) -> U {
match *self {
}
}
-impl<T: Const Owned> &RWReadMode<T> {
+impl<T:Const + Owned> &RWReadMode<T> {
/// Access the post-downgrade rwlock in read mode.
fn read<U>(blk: fn(x: &T) -> U) -> U {
match *self {
*
* Fails if `ofs` is greater or equal to the length of the vector
*/
-pub fn get<T: Copy>(t: CVec<T>, ofs: uint) -> T {
+pub fn get<T:Copy>(t: CVec<T>, ofs: uint) -> T {
assert ofs < len(t);
return unsafe { *ptr::mut_offset(t.base, ofs) };
}
*
* Fails if `ofs` is greater or equal to the length of the vector
*/
-pub fn set<T: Copy>(t: CVec<T>, ofs: uint, v: T) {
+pub fn set<T:Copy>(t: CVec<T>, ofs: uint, v: T) {
assert ofs < len(t);
unsafe { *ptr::mut_offset(t.base, ofs) = v };
}
priv port: Port<U>,
}
-impl<T: Owned, U: Owned> GenericChan<T> for DuplexStream<T, U> {
+impl<T:Owned,U:Owned> GenericChan<T> for DuplexStream<T, U> {
fn send(x: T) {
self.chan.send(x)
}
}
-impl<T: Owned, U: Owned> GenericSmartChan<T> for DuplexStream<T, U> {
+impl<T:Owned,U:Owned> GenericSmartChan<T> for DuplexStream<T, U> {
fn try_send(x: T) -> bool {
self.chan.try_send(x)
}
}
-impl<T: Owned, U: Owned> GenericPort<U> for DuplexStream<T, U> {
+impl<T:Owned,U:Owned> GenericPort<U> for DuplexStream<T, U> {
fn recv() -> U {
self.port.recv()
}
}
}
-impl<T: Owned, U: Owned> Peekable<U> for DuplexStream<T, U> {
+impl<T:Owned,U:Owned> Peekable<U> for DuplexStream<T, U> {
pure fn peek() -> bool {
self.port.peek()
}
}
-impl<T: Owned, U: Owned> Selectable for DuplexStream<T, U> {
+impl<T:Owned,U:Owned> Selectable for DuplexStream<T, U> {
pure fn header() -> *pipes::PacketHeader {
self.port.header()
}
}
/// Creates a bidirectional stream.
-pub fn DuplexStream<T: Owned, U: Owned>()
+pub fn DuplexStream<T:Owned,U:Owned>()
-> (DuplexStream<T, U>, DuplexStream<U, T>)
{
let (p1, c2) = pipes::stream();
assert *deq.get(3) == d;
}
- fn test_parameterized<T: Copy Eq Durable>(a: T, b: T, c: T, d: T) {
+ fn test_parameterized<T:Copy + Eq + Durable>(a: T, b: T, c: T, d: T) {
let mut deq = Deque::new();
assert deq.len() == 0;
deq.add_front(a);
}
/// Create a `FlatPort` from a `Port<~[u8]>`
- pub fn pipe_port<T: Decodable<DefaultDecoder>>(
+ pub fn pipe_port<T:Decodable<DefaultDecoder>>(
port: Port<~[u8]>
) -> PipePort<T> {
let unflat: DeserializingUnflattener<DefaultDecoder, T> =
}
/// Create a `FlatChan` from a `Chan<~[u8]>`
- pub fn pipe_chan<T: Encodable<DefaultEncoder>>(
+ pub fn pipe_chan<T:Encodable<DefaultEncoder>>(
chan: Chan<~[u8]>
) -> PipeChan<T> {
let flat: SerializingFlattener<DefaultEncoder, T> =
pub type PipeChan<T> = FlatChan<T, PodFlattener<T>, PipeByteChan>;
/// Create a `FlatPort` from a `Reader`
- pub fn reader_port<T: Copy Owned, R: Reader>(
+ pub fn reader_port<T:Copy + Owned,R:Reader>(
reader: R
) -> ReaderPort<T, R> {
let unflat: PodUnflattener<T> = PodUnflattener::new();
}
/// Create a `FlatChan` from a `Writer`
- pub fn writer_chan<T: Copy Owned, W: Writer>(
+ pub fn writer_chan<T:Copy + Owned,W:Writer>(
writer: W
) -> WriterChan<T, W> {
let flat: PodFlattener<T> = PodFlattener::new();
}
/// Create a `FlatPort` from a `Port<~[u8]>`
- pub fn pipe_port<T: Copy Owned>(port: Port<~[u8]>) -> PipePort<T> {
+ pub fn pipe_port<T:Copy + Owned>(port: Port<~[u8]>) -> PipePort<T> {
let unflat: PodUnflattener<T> = PodUnflattener::new();
let byte_port = PipeBytePort::new(port);
FlatPort::new(unflat, byte_port)
}
/// Create a `FlatChan` from a `Chan<~[u8]>`
- pub fn pipe_chan<T: Copy Owned>(chan: Chan<~[u8]>) -> PipeChan<T> {
+ pub fn pipe_chan<T:Copy + Owned>(chan: Chan<~[u8]>) -> PipeChan<T> {
let flat: PodFlattener<T> = PodFlattener::new();
let byte_chan = PipeByteChan::new(chan);
FlatChan::new(flat, byte_chan)
}
/// Create a pair of `FlatChan` and `FlatPort`, backed by pipes
- pub fn pipe_stream<T: Copy Owned>() -> (PipePort<T>, PipeChan<T>) {
+ pub fn pipe_stream<T:Copy + Owned>() -> (PipePort<T>, PipeChan<T>) {
let (port, chan) = pipes::stream();
return (pipe_port(port), pipe_chan(chan));
}
bogus: ()
}
- pub impl<T: Copy Owned> Unflattener<T> for PodUnflattener<T> {
+ pub impl<T:Copy + Owned> Unflattener<T> for PodUnflattener<T> {
fn unflatten(&self, buf: ~[u8]) -> T {
assert size_of::<T>() != 0;
assert size_of::<T>() == buf.len();
}
}
- pub impl<T: Copy Owned> Flattener<T> for PodFlattener<T> {
+ pub impl<T:Copy + Owned> Flattener<T> for PodFlattener<T> {
fn flatten(&self, val: T) -> ~[u8] {
assert size_of::<T>() != 0;
let val: *T = ptr::to_unsafe_ptr(&val);
}
}
- pub impl<T: Copy Owned> PodUnflattener<T> {
+ pub impl<T:Copy + Owned> PodUnflattener<T> {
static fn new() -> PodUnflattener<T> {
PodUnflattener {
bogus: ()
}
}
- pub impl<T: Copy Owned> PodFlattener<T> {
+ pub impl<T:Copy + Owned> PodFlattener<T> {
static fn new() -> PodFlattener<T> {
PodFlattener {
bogus: ()
serialize_value: SerializeValue<T>
}
- pub impl<D: Decoder, T: Decodable<D>> Unflattener<T>
+ pub impl<D:Decoder,T:Decodable<D>> Unflattener<T>
for DeserializingUnflattener<D, T> {
fn unflatten(&self, buf: ~[u8]) -> T {
(self.deserialize_buffer)(buf)
}
}
- pub impl<S: Encoder, T: Encodable<S>> Flattener<T>
+ pub impl<S:Encoder,T:Encodable<S>> Flattener<T>
for SerializingFlattener<S, T> {
fn flatten(&self, val: T) -> ~[u8] {
(self.serialize_value)(&val)
}
}
- pub impl<D: Decoder, T: Decodable<D>> DeserializingUnflattener<D, T> {
+ pub impl<D:Decoder,T:Decodable<D>> DeserializingUnflattener<D, T> {
static fn new(deserialize_buffer: DeserializeBuffer<T>)
-> DeserializingUnflattener<D, T> {
DeserializingUnflattener {
}
}
- pub impl<S: Encoder, T: Encodable<S>> SerializingFlattener<S, T> {
+ pub impl<S:Encoder,T:Encodable<S>> SerializingFlattener<S, T> {
static fn new(serialize_value: SerializeValue<T>)
-> SerializingFlattener<S, T> {
SerializingFlattener {
writer: W
}
- pub impl<R: Reader> BytePort for ReaderBytePort<R> {
+ pub impl<R:Reader> BytePort for ReaderBytePort<R> {
fn try_recv(&self, count: uint) -> Option<~[u8]> {
let mut left = count;
let mut bytes = ~[];
}
}
- pub impl<W: Writer> ByteChan for WriterByteChan<W> {
+ pub impl<W:Writer> ByteChan for WriterByteChan<W> {
fn send(&self, val: ~[u8]) {
self.writer.write(val);
}
}
- pub impl<R: Reader> ReaderBytePort<R> {
+ pub impl<R:Reader> ReaderBytePort<R> {
static fn new(r: R) -> ReaderBytePort<R> {
ReaderBytePort {
reader: r
}
}
- pub impl<W: Writer> WriterByteChan<W> {
+ pub impl<W:Writer> WriterByteChan<W> {
static fn new(w: W) -> WriterByteChan<W> {
WriterByteChan {
writer: w
type WriterChanFactory<F> =
~fn(TcpSocketBuf) -> FlatChan<int, F, WriterByteChan<TcpSocketBuf>>;
- fn test_some_tcp_stream<U: Unflattener<int>, F: Flattener<int>>(
+ fn test_some_tcp_stream<U:Unflattener<int>,F:Flattener<int>>(
reader_port: ReaderPortFactory<U>,
writer_chan: WriterChanFactory<F>,
port: uint) {
pod::pipe_port(port)
}
- fn test_try_recv_none1<P:
BytePort>(loader: PortLoader<P>) {
+ fn test_try_recv_none1<P:BytePort>(loader: PortLoader<P>) {
let bytes = ~[];
let port = loader(bytes);
let res: Option<int> = port.try_recv();
test_try_recv_none1(pipe_port_loader);
}
- fn test_try_recv_none2<P:
BytePort>(loader: PortLoader<P>) {
+ fn test_try_recv_none2<P:BytePort>(loader: PortLoader<P>) {
// The control word in the protocol is interrupted
let bytes = ~[0];
let port = loader(bytes);
test_try_recv_none2(pipe_port_loader);
}
- fn test_try_recv_none3<P:
BytePort>(loader: PortLoader<P>) {
+ fn test_try_recv_none3<P:BytePort>(loader: PortLoader<P>) {
const CONTINUE: [u8 * 4] = [0xAA, 0xBB, 0xCC, 0xDD];
// The control word is followed by garbage
let bytes = CONTINUE.to_vec() + ~[0];
test_try_recv_none3(pipe_port_loader);
}
- fn test_try_recv_none4<P:
BytePort>(+loader: PortLoader<P>) {
+ fn test_try_recv_none4<P:BytePort>(+loader: PortLoader<P>) {
assert do task::try || {
const CONTINUE: [u8 * 4] = [0xAA, 0xBB, 0xCC, 0xDD];
// The control word is followed by a valid length,
pub fn init<K, V>() -> Treemap<K, V> { @Empty }
/// Insert a value into the map
-pub fn insert<K: Copy Eq Ord, V: Copy>(m: Treemap<K, V>, k: K, v: V)
+pub fn insert<K:Copy + Eq + Ord,V:Copy>(m: Treemap<K, V>, k: K, v: V)
-> Treemap<K, V> {
@match m {
@Empty => Node(@k, @v, @Empty, @Empty),
}
/// Find a value based on the key
-pub fn find<K: Eq Ord, V: Copy>(m: Treemap<K, V>, k: K) -> Option<V> {
+pub fn find<K:Eq + Ord,V:Copy>(m: Treemap<K, V>, k: K) -> Option<V> {
match *m {
Empty => None,
Node(@ref kk, @copy v, left, right) => {
}
}
-pub impl<S: serialize::Encoder> serialize::Encodable<S> for Json {
+pub impl<S:serialize::Encoder> serialize::Encodable<S> for Json {
fn encode(&self, s: &S) {
match *self {
Number(v) => v.encode(s),
fn to_json() -> Json { String(copy *self) }
}
-impl<A: ToJson, B: ToJson> ToJson for (A, B) {
+impl<A:ToJson,B:ToJson> ToJson for (A, B) {
fn to_json() -> Json {
match self {
(ref a, ref b) => {
}
}
-impl<A: ToJson, B: ToJson, C: ToJson> ToJson for (A, B, C) {
+impl<A:ToJson,B:ToJson,C:ToJson> ToJson for (A, B, C) {
fn to_json() -> Json {
match self {
(ref a, ref b, ref c) => {
}
}
-impl<A: ToJson> ToJson for ~[A] {
+impl<A:ToJson> ToJson for ~[A] {
fn to_json() -> Json { List(self.map(|elt| elt.to_json())) }
}
-impl<A: ToJson Copy> ToJson for LinearMap<~str, A> {
+impl<A:ToJson + Copy> ToJson for LinearMap<~str, A> {
fn to_json() -> Json {
let mut d = LinearMap::new();
for self.each |&(key, value)| {
}
}
-impl<A:
ToJson> ToJson for Option<A> {
+impl<A:ToJson> ToJson for Option<A> {
fn to_json() -> Json {
match self {
None => Null,
// two fns copied from libsyntax/util/testing.rs.
// Should they be in their own crate?
- pub pure fn check_equal_ptr<T : cmp::Eq> (given : &T, expected: &T) {
+ pub pure fn check_equal_ptr<T:cmp::Eq> (given : &T, expected: &T) {
if !((given == expected) && (expected == given )) {
fail!(fmt!("given %?, expected %?",given,expected));
}
}
- pub pure fn check_equal<T : cmp::Eq> (given : T, expected: T) {
+ pub pure fn check_equal<T:cmp::Eq> (given : T, expected: T) {
if !((given == expected) && (expected == given )) {
fail!(fmt!("given %?, expected %?",given,expected));
}
}
/// Create a list from a vector
-pub pure fn from_vec<T: Copy>(v: &[T]) -> @List<T> {
+pub pure fn from_vec<T:Copy>(v: &[T]) -> @List<T> {
vec::foldr(v, @Nil::<T>, |h, t| @Cons(*h, t))
}
* * z - The initial value
* * f - The function to apply
*/
-pub fn foldl<T: Copy, U>(z: T, ls: @List<U>, f: fn(&T, &U) -> T) -> T {
+pub fn foldl<T:Copy,U>(z: T, ls: @List<U>, f: fn(&T, &U) -> T) -> T {
let mut accum: T = z;
do iter(ls) |elt| { accum = f(&accum, elt);}
accum
* When function `f` returns true then an option containing the element
* is returned. If `f` matches no elements then none is returned.
*/
-pub pure fn find<T: Copy>(ls: @List<T>, f: fn(&T) -> bool) -> Option<T> {
+pub pure fn find<T:Copy>(ls: @List<T>, f: fn(&T) -> bool) -> Option<T> {
let mut ls = ls;
loop {
ls = match *ls {
}
/// Returns true if a list contains an element with the given value
-pub fn has<T: Copy Eq>(ls: @List<T>, elt: T) -> bool {
+pub fn has<T:Copy + Eq>(ls: @List<T>, elt: T) -> bool {
for each(ls) |e| {
if *e == elt { return true; }
}
}
/// Returns true if the list is empty
-pub pure fn is_empty<T: Copy>(ls: @List<T>) -> bool {
+pub pure fn is_empty<T:Copy>(ls: @List<T>) -> bool {
match *ls {
Nil => true,
_ => false
}
/// Returns all but the first element of a list
-pub pure fn tail<T: Copy>(ls: @List<T>) -> @List<T> {
+pub pure fn tail<T:Copy>(ls: @List<T>) -> @List<T> {
match *ls {
Cons(_, tl) => return tl,
Nil => fail!(~"list empty")
}
/// Returns the first element of a list
-pub pure fn head<T: Copy>(ls: @List<T>) -> T {
+pub pure fn head<T:Copy>(ls: @List<T>) -> T {
match *ls {
Cons(copy hd, _) => hd,
// makes me sad
}
/// Appends one list to another
-pub pure fn append<T: Copy>(l: @List<T>, m: @List<T>) -> @List<T> {
+pub pure fn append<T:Copy>(l: @List<T>, m: @List<T>) -> @List<T> {
match *l {
Nil => return m,
Cons(copy x, xs) => {
/*
/// Push one element into the front of a list, returning a new list
/// THIS VERSION DOESN'T ACTUALLY WORK
-pure fn push<T: Copy>(ll: &mut @list<T>, vv: T) {
+pure fn push<T:Copy>(ll: &mut @list<T>, vv: T) {
ll = &mut @cons(vv, *ll)
}
*/
FoundAfter(@Entry<K,V>, @Entry<K,V>)
}
- priv impl<K:Eq IterBytes Hash, V> T<K, V> {
+ priv impl<K:Eq + IterBytes + Hash,V> T<K, V> {
pure fn search_rem(k: &K, h: uint, idx: uint,
e_root: @Entry<K,V>) -> SearchResult<K,V> {
let mut e0 = e_root;
}
}
- impl<K: Eq IterBytes Hash, V> Container for T<K, V> {
+ impl<K:Eq + IterBytes + Hash,V> Container for T<K, V> {
pure fn len(&self) -> uint { self.count }
pure fn is_empty(&self) -> bool { self.count == 0 }
}
- impl<K: Eq IterBytes Hash, V> Mutable for T<K, V> {
+ impl<K:Eq + IterBytes + Hash,V> Mutable for T<K, V> {
fn clear(&mut self) {
self.count = 0u;
self.chains = chains(initial_capacity);
}
}
- impl<K: Eq IterBytes Hash, V> T<K, V> {
+ impl<K:Eq + IterBytes + Hash,V> T<K, V> {
pure fn contains_key(&self, k: &K) -> bool {
let hash = k.hash_keyed(0,0) as uint;
match self.search_tbl(k, hash) {
}
}
- impl<K: Eq IterBytes Hash Copy, V: Copy> T<K, V> {
+ impl<K:Eq + IterBytes + Hash + Copy,V:Copy> T<K, V> {
pure fn find(&self, k: &K) -> Option<V> {
match self.search_tbl(k, k.hash_keyed(0,0) as uint) {
NotFound => None,
}
}
- impl<K:Eq IterBytes Hash Copy ToStr, V: ToStr Copy> T<K, V> {
+ impl<K:Eq + IterBytes + Hash + Copy + ToStr,V:ToStr + Copy> T<K, V> {
fn to_writer(wr: io::Writer) {
if self.count == 0u {
wr.write_str(~"{}");
}
}
- impl<K:Eq IterBytes Hash Copy ToStr, V: ToStr Copy> ToStr for T<K, V> {
+ impl<K:Eq + IterBytes + Hash + Copy + ToStr,V:ToStr + Copy> ToStr
+ for T<K, V> {
pure fn to_str(&self) -> ~str {
unsafe {
// Meh -- this should be safe
}
}
- impl<K:Eq IterBytes Hash Copy, V: Copy> ops::Index<K, V> for T<K, V> {
+ impl<K:Eq + IterBytes + Hash + Copy,V:Copy> ops::Index<K, V> for T<K, V> {
pure fn index(&self, k: K) -> V {
self.get(&k)
}
vec::from_elem(nchains, None)
}
- pub fn mk<K:Eq IterBytes Hash, V: Copy>() -> T<K,V> {
+ pub fn mk<K:Eq + IterBytes + Hash,V:Copy>() -> T<K,V> {
let slf: T<K, V> = @HashMap_ {count: 0u,
chains: chains(initial_capacity)};
slf
Construct a hashmap.
*/
-pub fn HashMap<K:Eq IterBytes Hash Const, V: Copy>()
+pub fn HashMap<K:Eq + IterBytes + Hash + Const,V:Copy>()
-> HashMap<K, V> {
chained::mk()
}
/// Convenience function for adding keys to a hashmap with nil type keys
-pub fn set_add<K:Eq IterBytes Hash Const Copy>(set: Set<K>, key: K) -> bool {
+pub fn set_add<K:Eq + IterBytes + Hash + Const + Copy>(set: Set<K>, key: K)
+ -> bool {
set.insert(key, ())
}
/// Convert a set into a vector.
-pub pure fn vec_from_set<T:Eq IterBytes Hash Copy>(s: Set<T>) -> ~[T] {
+pub pure fn vec_from_set<T:Eq + IterBytes + Hash + Copy>(s: Set<T>) -> ~[T] {
do vec::build_sized(s.len()) |push| {
for s.each_key() |&k| {
push(k);
}
/// Construct a hashmap from a vector
-pub fn hash_from_vec<K: Eq IterBytes Hash Const Copy, V: Copy>(
+pub fn hash_from_vec<K:Eq + IterBytes + Hash + Const + Copy,V:Copy>(
items: &[(K, V)]) -> HashMap<K, V> {
let map = HashMap();
for vec::each(items) |item| {
}
/// Create a smallintmap
-pub fn mk<T: Copy>() -> SmallIntMap<T> {
+pub fn mk<T:Copy>() -> SmallIntMap<T> {
let v = DVec();
SmallIntMap_(@SmallIntMap_ { v: v } )
}
* the specified key then the original value is replaced.
*/
#[inline(always)]
-pub fn insert<T: Copy>(self: SmallIntMap<T>, key: uint, val: T) {
+pub fn insert<T:Copy>(self: SmallIntMap<T>, key: uint, val: T) {
//io::println(fmt!("%?", key));
self.v.grow_set_elt(key, &None, Some(val));
}
* Get the value for the specified key. If the key does not exist
* in the map then returns none
*/
-pub pure fn find<T: Copy>(self: SmallIntMap<T>, key: uint) -> Option<T> {
+pub pure fn find<T:Copy>(self: SmallIntMap<T>, key: uint) -> Option<T> {
if key < self.v.len() { return self.v.get_elt(key); }
return None::<T>;
}
*
* If the key does not exist in the map
*/
-pub pure fn get<T: Copy>(self: SmallIntMap<T>, key: uint) -> T {
+pub pure fn get<T:Copy>(self: SmallIntMap<T>, key: uint) -> T {
match find(self, key) {
None => {
error!("smallintmap::get(): key not present");
}
/// Returns true if the map contains a value for the specified key
-pub pure fn contains_key<T: Copy>(self: SmallIntMap<T>, key: uint) -> bool {
+pub pure fn contains_key<T:Copy>(self: SmallIntMap<T>, key: uint) -> bool {
return !find(self, key).is_none();
}
}
/// Implements the map::map interface for smallintmap
-impl<V: Copy> SmallIntMap<V> {
+impl<V:Copy> SmallIntMap<V> {
#[inline(always)]
fn insert(key: uint, value: V) -> bool {
let exists = contains_key(self, key);
}
}
-impl<V: Copy> ops::Index<uint, V> for SmallIntMap<V> {
+impl<V:Copy> ops::Index<uint, V> for SmallIntMap<V> {
pure fn index(&self, key: uint) -> V {
unsafe {
get(*self, key)
* This is used to build most of the other parallel vector functions,
* like map or alli.
*/
-fn map_slices<A: Copy Owned, B: Copy Owned>(
+fn map_slices<A:Copy + Owned,B:Copy + Owned>(
xs: &[A],
f: &fn() -> ~fn(uint, v: &[A]) -> B)
-> ~[B] {
}
/// A parallel version of map.
-pub fn map<A: Copy Owned, B: Copy Owned>(
+pub fn map<A:Copy + Owned,B:Copy + Owned>(
xs: &[A], fn_factory: &fn() -> ~fn(&A) -> B) -> ~[B] {
vec::concat(map_slices(xs, || {
let f = fn_factory();
}
/// A parallel version of mapi.
-pub fn mapi<A: Copy Owned, B: Copy Owned>(
+pub fn mapi<A:Copy + Owned,B:Copy + Owned>(
xs: &[A],
fn_factory: &fn() -> ~fn(uint, &A) -> B) -> ~[B]
{
}
/// Returns true if the function holds for all elements in the vector.
-pub fn alli<A: Copy Owned>(
+pub fn alli<A:Copy + Owned>(
xs: &[A],
fn_factory: &fn() -> ~fn(uint, &A) -> bool) -> bool
{
}
/// Returns true if the function holds for any elements in the vector.
-pub fn any<A: Copy Owned>(
+pub fn any<A:Copy + Owned>(
xs: &[A],
fn_factory: &fn() -> ~fn(&A) -> bool) -> bool {
do vec::any(map_slices(xs, || {
priv data: ~[T],
}
-impl<T: Ord> BaseIter<T> for PriorityQueue<T> {
+impl<T:Ord> BaseIter<T> for PriorityQueue<T> {
/// Visit all values in the underlying vector.
///
/// The values are **not** visited in order.
pure fn size_hint(&self) -> Option<uint> { self.data.size_hint() }
}
-impl<T: Ord> Container for PriorityQueue<T> {
+impl<T:Ord> Container for PriorityQueue<T> {
/// Returns the length of the queue
pure fn len(&self) -> uint { self.data.len() }
pure fn is_empty(&self) -> bool { self.data.is_empty() }
}
-impl<T: Ord> Mutable for PriorityQueue<T> {
+impl<T:Ord> Mutable for PriorityQueue<T> {
/// Drop all items from the queue
fn clear(&mut self) { self.data.truncate(0) }
}
-impl <T: Ord> PriorityQueue<T> {
+impl <T:Ord> PriorityQueue<T> {
/// Returns the greatest item in the queue - fails if empty
pure fn top(&self) -> &self/T { &self.data[0] }
assert a < b;
i += 1;
}
-}
\ No newline at end of file
+}
fn read_tup_elt<T>(&self, idx: uint, f: fn() -> T) -> T;
}
-pub trait Encodable<S: Encoder> {
+pub trait Encodable<S:Encoder> {
fn encode(&self, s: &S);
}
-pub trait Decodable<D: Decoder> {
+pub trait Decodable<D:Decoder> {
static fn decode(&self, d: &D) -> Self;
}
-pub impl<S: Encoder> Encodable<S> for uint {
+pub impl<S:Encoder> Encodable<S> for uint {
fn encode(&self, s: &S) { s.emit_uint(*self) }
}
-pub impl<D: Decoder> Decodable<D> for uint {
+pub impl<D:Decoder> Decodable<D> for uint {
static fn decode(&self, d: &D) -> uint {
d.read_uint()
}
}
-pub impl<S: Encoder> Encodable<S> for u8 {
+pub impl<S:Encoder> Encodable<S> for u8 {
fn encode(&self, s: &S) { s.emit_u8(*self) }
}
-pub impl<D: Decoder> Decodable<D> for u8 {
+pub impl<D:Decoder> Decodable<D> for u8 {
static fn decode(&self, d: &D) -> u8 {
d.read_u8()
}
}
-pub impl<S: Encoder> Encodable<S> for u16 {
+pub impl<S:Encoder> Encodable<S> for u16 {
fn encode(&self, s: &S) { s.emit_u16(*self) }
}
-pub impl<D: Decoder> Decodable<D> for u16 {
+pub impl<D:Decoder> Decodable<D> for u16 {
static fn decode(&self, d: &D) -> u16 {
d.read_u16()
}
}
-pub impl<S: Encoder> Encodable<S> for u32 {
+pub impl<S:Encoder> Encodable<S> for u32 {
fn encode(&self, s: &S) { s.emit_u32(*self) }
}
-pub impl<D: Decoder> Decodable<D> for u32 {
+pub impl<D:Decoder> Decodable<D> for u32 {
static fn decode(&self, d: &D) -> u32 {
d.read_u32()
}
}
-pub impl<S: Encoder> Encodable<S> for u64 {
+pub impl<S:Encoder> Encodable<S> for u64 {
fn encode(&self, s: &S) { s.emit_u64(*self) }
}
-pub impl<D: Decoder> Decodable<D> for u64 {
+pub impl<D:Decoder> Decodable<D> for u64 {
static fn decode(&self, d: &D) -> u64 {
d.read_u64()
}
}
-pub impl<S: Encoder> Encodable<S> for int {
+pub impl<S:Encoder> Encodable<S> for int {
fn encode(&self, s: &S) { s.emit_int(*self) }
}
-pub impl<D: Decoder> Decodable<D> for int {
+pub impl<D:Decoder> Decodable<D> for int {
static fn decode(&self, d: &D) -> int {
d.read_int()
}
}
-pub impl<S: Encoder> Encodable<S> for i8 {
+pub impl<S:Encoder> Encodable<S> for i8 {
fn encode(&self, s: &S) { s.emit_i8(*self) }
}
-pub impl<D: Decoder> Decodable<D> for i8 {
+pub impl<D:Decoder> Decodable<D> for i8 {
static fn decode(&self, d: &D) -> i8 {
d.read_i8()
}
}
-pub impl<S: Encoder> Encodable<S> for i16 {
+pub impl<S:Encoder> Encodable<S> for i16 {
fn encode(&self, s: &S) { s.emit_i16(*self) }
}
-pub impl<D: Decoder> Decodable<D> for i16 {
+pub impl<D:Decoder> Decodable<D> for i16 {
static fn decode(&self, d: &D) -> i16 {
d.read_i16()
}
}
-pub impl<S: Encoder> Encodable<S> for i32 {
+pub impl<S:Encoder> Encodable<S> for i32 {
fn encode(&self, s: &S) { s.emit_i32(*self) }
}
-pub impl<D: Decoder> Decodable<D> for i32 {
+pub impl<D:Decoder> Decodable<D> for i32 {
static fn decode(&self, d: &D) -> i32 {
d.read_i32()
}
}
-pub impl<S: Encoder> Encodable<S> for i64 {
+pub impl<S:Encoder> Encodable<S> for i64 {
fn encode(&self, s: &S) { s.emit_i64(*self) }
}
-pub impl<D: Decoder> Decodable<D> for i64 {
+pub impl<D:Decoder> Decodable<D> for i64 {
static fn decode(&self, d: &D) -> i64 {
d.read_i64()
}
}
-pub impl<S: Encoder> Encodable<S> for &str {
+pub impl<S:Encoder> Encodable<S> for &str {
fn encode(&self, s: &S) { s.emit_borrowed_str(*self) }
}
-pub impl<S: Encoder> Encodable<S> for ~str {
+pub impl<S:Encoder> Encodable<S> for ~str {
fn encode(&self, s: &S) { s.emit_owned_str(*self) }
}
-pub impl<D: Decoder> Decodable<D> for ~str {
+pub impl<D:Decoder> Decodable<D> for ~str {
static fn decode(&self, d: &D) -> ~str {
d.read_owned_str()
}
}
-pub impl<S: Encoder> Encodable<S> for @str {
+pub impl<S:Encoder> Encodable<S> for @str {
fn encode(&self, s: &S) { s.emit_managed_str(*self) }
}
-pub impl<D: Decoder> Decodable<D> for @str {
+pub impl<D:Decoder> Decodable<D> for @str {
static fn decode(&self, d: &D) -> @str {
d.read_managed_str()
}
}
-pub impl<S: Encoder> Encodable<S> for float {
+pub impl<S:Encoder> Encodable<S> for float {
fn encode(&self, s: &S) { s.emit_float(*self) }
}
-pub impl<D: Decoder> Decodable<D> for float {
+pub impl<D:Decoder> Decodable<D> for float {
static fn decode(&self, d: &D) -> float {
d.read_float()
}
}
-pub impl<S: Encoder> Encodable<S> for f32 {
+pub impl<S:Encoder> Encodable<S> for f32 {
fn encode(&self, s: &S) { s.emit_f32(*self) }
}
-pub impl<D: Decoder> Decodable<D> for f32 {
+pub impl<D:Decoder> Decodable<D> for f32 {
static fn decode(&self, d: &D) -> f32 {
d.read_f32() }
}
-pub impl<S: Encoder> Encodable<S> for f64 {
+pub impl<S:Encoder> Encodable<S> for f64 {
fn encode(&self, s: &S) { s.emit_f64(*self) }
}
-pub impl<D: Decoder> Decodable<D> for f64 {
+pub impl<D:Decoder> Decodable<D> for f64 {
static fn decode(&self, d: &D) -> f64 {
d.read_f64()
}
}
-pub impl<S: Encoder> Encodable<S> for bool {
+pub impl<S:Encoder> Encodable<S> for bool {
fn encode(&self, s: &S) { s.emit_bool(*self) }
}
-pub impl<D: Decoder> Decodable<D> for bool {
+pub impl<D:Decoder> Decodable<D> for bool {
static fn decode(&self, d: &D) -> bool {
d.read_bool()
}
}
-pub impl<S: Encoder> Encodable<S> for () {
+pub impl<S:Encoder> Encodable<S> for () {
fn encode(&self, s: &S) { s.emit_nil() }
}
-pub impl<D: Decoder> Decodable<D> for () {
+pub impl<D:Decoder> Decodable<D> for () {
static fn decode(&self, d: &D) -> () {
d.read_nil()
}
}
-pub impl<S: Encoder, T: Encodable<S>> Encodable<S> for &T {
+pub impl<S:Encoder,T:Encodable<S>> Encodable<S> for &T {
fn encode(&self, s: &S) {
s.emit_borrowed(|| (**self).encode(s))
}
}
-pub impl<S: Encoder, T: Encodable<S>> Encodable<S> for ~T {
+pub impl<S:Encoder,T:Encodable<S>> Encodable<S> for ~T {
fn encode(&self, s: &S) {
s.emit_owned(|| (**self).encode(s))
}
}
-pub impl<D: Decoder, T: Decodable<D>> Decodable<D> for ~T {
+pub impl<D:Decoder,T:Decodable<D>> Decodable<D> for ~T {
static fn decode(&self, d: &D) -> ~T {
d.read_owned(|| ~Decodable::decode(d))
}
}
-pub impl<S: Encoder, T: Encodable<S>> Encodable<S> for @T {
+pub impl<S:Encoder,T:Encodable<S>> Encodable<S> for @T {
fn encode(&self, s: &S) {
s.emit_managed(|| (**self).encode(s))
}
}
-pub impl<D: Decoder, T: Decodable<D>> Decodable<D> for @T {
+pub impl<D:Decoder,T:Decodable<D>> Decodable<D> for @T {
static fn decode(&self, d: &D) -> @T {
d.read_managed(|| @Decodable::decode(d))
}
}
-pub impl<S: Encoder, T: Encodable<S>> Encodable<S> for &[T] {
+pub impl<S:Encoder,T:Encodable<S>> Encodable<S> for &[T] {
fn encode(&self, s: &S) {
do s.emit_borrowed_vec(self.len()) {
for self.eachi |i, e| {
}
}
-pub impl<S: Encoder, T: Encodable<S>> Encodable<S> for ~[T] {
+pub impl<S:Encoder,T:Encodable<S>> Encodable<S> for ~[T] {
fn encode(&self, s: &S) {
do s.emit_owned_vec(self.len()) {
for self.eachi |i, e| {
}
}
-pub impl<D: Decoder, T: Decodable<D>> Decodable<D> for ~[T] {
+pub impl<D:Decoder,T:Decodable<D>> Decodable<D> for ~[T] {
static fn decode(&self, d: &D) -> ~[T] {
do d.read_owned_vec |len| {
do vec::from_fn(len) |i| {
}
}
-pub impl<S: Encoder, T: Encodable<S>> Encodable<S> for @[T] {
+pub impl<S:Encoder,T:Encodable<S>> Encodable<S> for @[T] {
fn encode(&self, s: &S) {
do s.emit_managed_vec(self.len()) {
for self.eachi |i, e| {
}
}
-pub impl<D: Decoder, T: Decodable<D>> Decodable<D> for @[T] {
+pub impl<D:Decoder,T:Decodable<D>> Decodable<D> for @[T] {
static fn decode(&self, d: &D) -> @[T] {
do d.read_managed_vec |len| {
do at_vec::from_fn(len) |i| {
}
}
-pub impl<S: Encoder, T: Encodable<S>> Encodable<S> for Option<T> {
+pub impl<S:Encoder,T:Encodable<S>> Encodable<S> for Option<T> {
fn encode(&self, s: &S) {
do s.emit_enum(~"option") {
match *self {
}
}
-pub impl<D: Decoder, T: Decodable<D>> Decodable<D> for Option<T> {
+pub impl<D:Decoder,T:Decodable<D>> Decodable<D> for Option<T> {
static fn decode(&self, d: &D) -> Option<T> {
do d.read_enum(~"option") {
do d.read_enum_variant |i| {
}
}
-pub impl<S: Encoder, T0: Encodable<S>, T1: Encodable<S>> Encodable<S>
+pub impl<S:Encoder,T0:Encodable<S>,T1:Encodable<S>> Encodable<S>
for (T0, T1) {
fn encode(&self, s: &S) {
match *self {
}
}
-pub impl<D: Decoder, T0: Decodable<D>, T1: Decodable<D>> Decodable<D>
+pub impl<D:Decoder,T0:Decodable<D>,T1:Decodable<D>> Decodable<D>
for (T0, T1) {
static fn decode(&self, d: &D) -> (T0, T1) {
do d.read_tup(2) {
fn emit_from_vec<T>(&self, v: &[T], f: fn(v: &T));
}
-pub impl<S: Encoder> EncoderHelpers for S {
+pub impl<S:Encoder> EncoderHelpers for S {
fn emit_from_vec<T>(&self, v: &[T], f: fn(v: &T)) {
do self.emit_owned_vec(v.len()) {
for v.eachi |i, e| {
fn read_to_vec<T>(&self, f: fn() -> T) -> ~[T];
}
-pub impl<D: Decoder> DecoderHelpers for D {
+pub impl<D:Decoder> DecoderHelpers for D {
fn read_to_vec<T>(&self, f: fn() -> T) -> ~[T] {
do self.read_owned_vec |len| {
do vec::from_fn(len) |i| {
}
}
-pub impl<V: Copy> SmallIntMap<V> {
+pub impl<V:Copy> SmallIntMap<V> {
fn update_with_key(&mut self, key: uint, val: V,
ff: fn(uint, V, V) -> V) -> bool {
let new_val = match self.find(&key) {
* Has worst case O(n log n) performance, best case O(n), but
* is not space efficient. This is a stable sort.
*/
-pub pure fn merge_sort<T: Copy>(v: &[const T], le: Le<T>) -> ~[T] {
+pub pure fn merge_sort<T:Copy>(v: &[const T], le: Le<T>) -> ~[T] {
type Slice = (uint, uint);
unsafe {return merge_sort_(v, (0u, len(v)), le);}
- fn merge_sort_<T: Copy>(v: &[const T], slice: Slice, le: Le<T>)
+ fn merge_sort_<T:Copy>(v: &[const T], slice: Slice, le: Le<T>)
-> ~[T] {
let begin = slice.first();
let end = slice.second();
return merge(le, merge_sort_(v, a, le), merge_sort_(v, b, le));
}
- fn merge<T: Copy>(le: Le<T>, a: &[T], b: &[T]) -> ~[T] {
+ fn merge<T:Copy>(le: Le<T>, a: &[T], b: &[T]) -> ~[T] {
let mut rs = vec::with_capacity(len(a) + len(b));
let a_len = len(a);
let mut a_ix = 0;
qsort::<T>(arr, 0u, len::<T>(arr) - 1u, compare_func);
}
-fn qsort3<T: Copy Ord Eq>(arr: &mut [T], left: int, right: int) {
+fn qsort3<T:Copy + Ord + Eq>(arr: &mut [T], left: int, right: int) {
if right <= left { return; }
let v: T = arr[right];
let mut i: int = left - 1;
*
* This is an unstable sort.
*/
-pub fn quick_sort3<T: Copy Ord Eq>(arr: &mut [T]) {
+pub fn quick_sort3<T:Copy + Ord + Eq>(arr: &mut [T]) {
if arr.len() <= 1 { return; }
qsort3(arr, 0, (arr.len() - 1) as int);
}
fn qsort(self);
}
-impl<T: Copy Ord Eq> Sort for &mut [T] {
+impl<T:Copy + Ord + Eq> Sort for &mut [T] {
fn qsort(self) { quick_sort3(self); }
}
const MIN_GALLOP: uint = 7;
const INITIAL_TMP_STORAGE: uint = 128;
-pub fn tim_sort<T: Copy Ord>(array: &mut [T]) {
+pub fn tim_sort<T:Copy + Ord>(array: &mut [T]) {
let size = array.len();
if size < 2 {
return;
ms.merge_force_collapse(array);
}
-fn binarysort<T: Copy Ord>(array: &mut [T], start: uint) {
+fn binarysort<T:Copy + Ord>(array: &mut [T], start: uint) {
let size = array.len();
let mut start = start;
assert start <= size;
return n + r;
}
-fn count_run_ascending<T: Copy Ord>(array: &mut [T]) -> uint {
+fn count_run_ascending<T:Copy + Ord>(array: &mut [T]) -> uint {
let size = array.len();
assert size > 0;
if size == 1 { return 1; }
return run;
}
-pure fn gallop_left<T: Copy Ord>(key: &const T, array: &[const T],
+pure fn gallop_left<T:Copy + Ord>(key: &const T, array: &[const T],
hint: uint) -> uint {
let size = array.len();
assert size != 0 && hint < size;
return ofs;
}
-pure fn gallop_right<T: Copy Ord>(key: &const T, array: &[const T],
+pure fn gallop_right<T:Copy + Ord>(key: &const T, array: &[const T],
hint: uint) -> uint {
let size = array.len();
assert size != 0 && hint < size;
}
}
-impl<T: Copy Ord> MergeState<T> {
+impl<T:Copy + Ord> MergeState<T> {
fn push_run(&self, run_base: uint, run_len: uint) {
let tmp = RunState{base: run_base, len: run_len};
self.runs.push(tmp);
}
#[inline(always)]
-fn copy_vec<T: Copy>(dest: &mut [T], s1: uint,
+fn copy_vec<T:Copy>(dest: &mut [T], s1: uint,
from: &[const T], s2: uint, len: uint) {
assert s1+len <= dest.len() && s2+len <= from.len();
tabulate_managed(low, high);
}
- fn multiplyVec<T: Copy>(arr: &[const T], num: uint) -> ~[T] {
+ fn multiplyVec<T:Copy>(arr: &[const T], num: uint) -> ~[T] {
let size = arr.len();
let res = do vec::from_fn(num) |i| {
arr[i % size]
}
fn tabulate_unique(lo: uint, hi: uint) {
- fn isSorted<T: Ord>(arr: &[const T]) {
+ fn isSorted<T:Ord>(arr: &[const T]) {
for uint::range(0, arr.len()-1) |i| {
if arr[i] > arr[i+1] {
fail!(~"Array not sorted");
}
fn tabulate_managed(lo: uint, hi: uint) {
- fn isSorted<T: Ord>(arr: &[const @T]) {
+ fn isSorted<T:Ord>(arr: &[const @T]) {
for uint::range(0, arr.len()-1) |i| {
if arr[i] > arr[i+1] {
fail!(~"Array not sorted");
enum Sem<Q> = Exclusive<SemInner<Q>>;
#[doc(hidden)]
-fn new_sem<Q: Owned>(count: int, q: Q) -> Sem<Q> {
+fn new_sem<Q:Owned>(count: int, q: Q) -> Sem<Q> {
Sem(exclusive(SemInner {
mut count: count, waiters: new_waitqueue(), blocked: q }))
}
}
#[doc(hidden)]
-impl<Q: Owned> &Sem<Q> {
+impl<Q:Owned> &Sem<Q> {
fn acquire() {
let mut waiter_nobe = None;
unsafe {
type SemAndSignalRelease = SemReleaseGeneric<~[Waitqueue]>;
struct SemReleaseGeneric<Q> { sem: &Sem<Q> }
-impl<Q: Owned> Drop for SemReleaseGeneric<Q> {
+impl<Q:Owned> Drop for SemReleaseGeneric<Q> {
fn finalize(&self) {
self.sem.release();
}
* * ch - a channel of type T to send a `val` on
* * val - a value of type T to send over the provided `ch`
*/
-pub fn delayed_send<T: Owned>(iotask: &IoTask,
+pub fn delayed_send<T:Owned>(iotask: &IoTask,
msecs: uint,
ch: &Chan<T>,
val: T) {
* on the provided port in the allotted timeout period, then the result will
* be a `Some(T)`. If not, then `None` will be returned.
*/
-pub fn recv_timeout<T: Copy Owned>(iotask: &IoTask,
+pub fn recv_timeout<T:Copy + Owned>(iotask: &IoTask,
msecs: uint,
wait_po: &Port<T>)
-> Option<T> {
priv length: uint
}
-impl<K: Eq Ord, V: Eq> Eq for TreeMap<K, V> {
+impl<K:Eq + Ord,V:Eq> Eq for TreeMap<K, V> {
pure fn eq(&self, other: &TreeMap<K, V>) -> bool {
if self.len() != other.len() {
false
}
// Lexicographical comparison
-pure fn lt<K: Ord, V>(a: &TreeMap<K, V>, b: &TreeMap<K, V>) -> bool {
+pure fn lt<K:Ord,V>(a: &TreeMap<K, V>, b: &TreeMap<K, V>) -> bool {
let mut x = a.iter();
let mut y = b.iter();
return a_len < b_len;
}
-impl<K: Ord, V> Ord for TreeMap<K, V> {
+impl<K:Ord,V> Ord for TreeMap<K, V> {
#[inline(always)]
pure fn lt(&self, other: &TreeMap<K, V>) -> bool {
lt(self, other)
}
}
-impl<K: Ord, V> BaseIter<(&K, &V)> for TreeMap<K, V> {
+impl<K:Ord,V> BaseIter<(&K, &V)> for TreeMap<K, V> {
/// Visit all key-value pairs in order
pure fn each(&self, f: fn(&(&self/K, &self/V)) -> bool) {
each(&self.root, f)
pure fn size_hint(&self) -> Option<uint> { Some(self.len()) }
}
-impl<K: Ord, V> ReverseIter<(&K, &V)> for TreeMap<K, V> {
+impl<K:Ord,V> ReverseIter<(&K, &V)> for TreeMap<K, V> {
/// Visit all key-value pairs in reverse order
pure fn each_reverse(&self, f: fn(&(&self/K, &self/V)) -> bool) {
each_reverse(&self.root, f);
}
}
-impl<K: Ord, V> Container for TreeMap<K, V> {
+impl<K:Ord,V> Container for TreeMap<K, V> {
/// Return the number of elements in the map
pure fn len(&self) -> uint { self.length }
pure fn is_empty(&self) -> bool { self.root.is_none() }
}
-impl<K: Ord, V> Mutable for TreeMap<K, V> {
+impl<K:Ord,V> Mutable for TreeMap<K, V> {
/// Clear the map, removing all key-value pairs.
fn clear(&mut self) {
self.root = None;
}
}
-impl<K: Ord, V> Map<K, V> for TreeMap<K, V> {
+impl<K:Ord,V> Map<K, V> for TreeMap<K, V> {
/// Return true if the map contains a value for the specified key
pure fn contains_key(&self, key: &K) -> bool {
self.find(key).is_some()
}
}
-impl <K: Ord, V> TreeMap<K, V> {
+impl <K:Ord,V> TreeMap<K, V> {
/// Create an empty TreeMap
static pure fn new() -> TreeMap<K, V> { TreeMap{root: None, length: 0} }
priv current: Option<&~TreeNode<K, V>>
}
-impl <K: Ord, V> TreeMapIterator<K, V> {
+impl <K:Ord,V> TreeMapIterator<K, V> {
// Returns the current node, or None if this iterator is at the end.
fn get(&const self) -> Option<(&self/K, &self/V)> {
match self.current {
/// Advance the iterator to the next node (in order). If this iterator
/// is finished, does nothing.
-pub fn map_next<K: Ord, V>(iter: &mut TreeMapIterator/&a<K, V>) {
+pub fn map_next<K:Ord,V>(iter: &mut TreeMapIterator/&a<K, V>) {
while !iter.stack.is_empty() || iter.node.is_some() {
match *iter.node {
Some(ref x) => {
priv map: TreeMap<T, ()>
}
-impl<T: Ord> BaseIter<T> for TreeSet<T> {
+impl<T:Ord> BaseIter<T> for TreeSet<T> {
/// Visit all values in order
pure fn each(&self, f: fn(&T) -> bool) { self.map.each_key(f) }
pure fn size_hint(&self) -> Option<uint> { Some(self.len()) }
}
-impl<T: Ord> ReverseIter<T> for TreeSet<T> {
+impl<T:Ord> ReverseIter<T> for TreeSet<T> {
/// Visit all values in reverse order
pure fn each_reverse(&self, f: fn(&T) -> bool) {
self.map.each_key_reverse(f)
}
}
-impl<T: Eq Ord> Eq for TreeSet<T> {
+impl<T:Eq + Ord> Eq for TreeSet<T> {
pure fn eq(&self, other: &TreeSet<T>) -> bool { self.map == other.map }
pure fn ne(&self, other: &TreeSet<T>) -> bool { self.map != other.map }
}
-impl<T: Ord> Ord for TreeSet<T> {
+impl<T:Ord> Ord for TreeSet<T> {
#[inline(always)]
pure fn lt(&self, other: &TreeSet<T>) -> bool { self.map < other.map }
#[inline(always)]
pure fn gt(&self, other: &TreeSet<T>) -> bool { self.map > other.map }
}
-impl<T: Ord> Container for TreeSet<T> {
+impl<T:Ord> Container for TreeSet<T> {
/// Return the number of elements in the set
pure fn len(&self) -> uint { self.map.len() }
pure fn is_empty(&self) -> bool { self.map.is_empty() }
}
-impl<T: Ord> Mutable for TreeSet<T> {
+impl<T:Ord> Mutable for TreeSet<T> {
/// Clear the set, removing all values.
fn clear(&mut self) { self.map.clear() }
}
-impl<T: Ord> Set<T> for TreeSet<T> {
+impl<T:Ord> Set<T> for TreeSet<T> {
/// Return true if the set contains a value
pure fn contains(&self, value: &T) -> bool {
self.map.contains_key(value)
}
}
-impl <T: Ord> TreeSet<T> {
+impl <T:Ord> TreeSet<T> {
/// Create an empty TreeSet
static pure fn new() -> TreeSet<T> { TreeSet{map: TreeMap::new()} }
priv iter: TreeMapIterator<T, ()>
}
-impl <T: Ord> TreeSetIterator<T> {
+impl <T:Ord> TreeSetIterator<T> {
/// Returns the current node, or None if this iterator is at the end.
fn get(&const self) -> Option<&self/T> {
match self.iter.get() {
/// Advance the iterator to the next node (in order). If this iterator is
/// finished, does nothing.
-pub fn set_next<T: Ord>(iter: &mut TreeSetIterator/&a<T>) {
+pub fn set_next<T:Ord>(iter: &mut TreeSetIterator/&a<T>) {
map_next(&mut iter.iter);
}
level: uint
}
-impl <K: Ord, V> TreeNode<K, V> {
+impl <K:Ord,V> TreeNode<K, V> {
#[inline(always)]
static pure fn new(key: K, value: V) -> TreeNode<K, V> {
TreeNode{key: key, value: value, left: None, right: None, level: 1}
}
}
-pure fn each<K: Ord, V>(node: &r/Option<~TreeNode<K, V>>,
+pure fn each<K:Ord,V>(node: &r/Option<~TreeNode<K, V>>,
f: fn(&(&r/K, &r/V)) -> bool) {
do node.iter |x| {
each(&x.left, f);
}
}
-pure fn each_reverse<K: Ord, V>(node: &r/Option<~TreeNode<K, V>>,
+pure fn each_reverse<K:Ord,V>(node: &r/Option<~TreeNode<K, V>>,
f: fn(&(&r/K, &r/V)) -> bool) {
do node.iter |x| {
each_reverse(&x.right, f);
}
// Remove left horizontal link by rotating right
-fn skew<K: Ord, V>(node: &mut ~TreeNode<K, V>) {
+fn skew<K:Ord,V>(node: &mut ~TreeNode<K, V>) {
if node.left.map_default(false, |x| x.level == node.level) {
let mut save = node.left.swap_unwrap();
node.left <-> save.right; // save.right now None
// Remove dual horizontal link by rotating left and increasing level of
// the parent
-fn split<K: Ord, V>(node: &mut ~TreeNode<K, V>) {
+fn split<K:Ord,V>(node: &mut ~TreeNode<K, V>) {
if node.right.map_default(false,
|x| x.right.map_default(false, |y| y.level == node.level)) {
let mut save = node.right.swap_unwrap();
}
}
-fn insert<K: Ord, V>(node: &mut Option<~TreeNode<K, V>>, key: K,
+fn insert<K:Ord,V>(node: &mut Option<~TreeNode<K, V>>, key: K,
value: V) -> bool {
match *node {
Some(ref mut save) => {
}
}
-fn remove<K: Ord, V>(node: &mut Option<~TreeNode<K, V>>, key: &K) -> bool {
- fn heir_swap<K: Ord, V>(node: &mut ~TreeNode<K, V>,
+fn remove<K:Ord,V>(node: &mut Option<~TreeNode<K, V>>, key: &K) -> bool {
+ fn heir_swap<K:Ord,V>(node: &mut ~TreeNode<K, V>,
child: &mut Option<~TreeNode<K, V>>) {
// *could* be done without recursion, but it won't borrow check
do child.mutate |mut child| {
assert m.find(&k1) == Some(&v1);
}
- fn check_equal<K: Eq Ord, V: Eq>(ctrl: &[(K, V)], map: &TreeMap<K, V>) {
+ fn check_equal<K:Eq + Ord,V:Eq>(ctrl: &[(K, V)], map: &TreeMap<K, V>) {
assert ctrl.is_empty() == map.is_empty();
for ctrl.each |x| {
let &(k, v) = x;
}
}
- fn check_left<K: Ord, V>(node: &Option<~TreeNode<K, V>>,
+ fn check_left<K:Ord,V>(node: &Option<~TreeNode<K, V>>,
parent: &~TreeNode<K, V>) {
match *node {
Some(ref r) => {
}
}
- fn check_right<K: Ord, V>(node: &Option<~TreeNode<K, V>>,
+ fn check_right<K:Ord,V>(node: &Option<~TreeNode<K, V>>,
parent: &~TreeNode<K, V>, parent_red: bool) {
match *node {
Some(ref r) => {
}
}
- fn check_structure<K: Ord, V>(map: &TreeMap<K, V>) {
+ fn check_structure<K:Ord,V>(map: &TreeMap<K, V>) {
match map.root {
Some(ref r) => {
check_left(&r.left, r);
type WorkMap = LinearMap<WorkKey, ~str>;
-pub impl<S: Encoder> Encodable<S> for WorkMap {
+pub impl<S:Encoder> Encodable<S> for WorkMap {
fn encode(&self, s: &S) {
let mut d = ~[];
for self.each |&(k, v)| {
}
}
-pub impl<D: Decoder> Decodable<D> for WorkMap {
+pub impl<D:Decoder> Decodable<D> for WorkMap {
static fn decode(&self, d: &D) -> WorkMap {
let v : ~[(WorkKey,~str)] = Decodable::decode(d);
let mut w = LinearMap::new();
#[deriving_eq]
pub struct ident { repr: uint }
-pub impl<S: Encoder> Encodable<S> for ident {
+pub impl<S:Encoder> Encodable<S> for ident {
fn encode(&self, s: &S) {
let intr = match unsafe {
task::local_data::local_data_get(interner_key!())
}
}
-pub impl<D: Decoder> Decodable<D> for ident {
+pub impl<D:Decoder> Decodable<D> for ident {
static fn decode(d: &D) -> ident {
let intr = match unsafe {
task::local_data::local_data_get(interner_key!())
infer(node_id)
}
-pub impl<T: to_bytes::IterBytes> to_bytes::IterBytes for inferable<T> {
+pub impl<T:to_bytes::IterBytes> to_bytes::IterBytes for inferable<T> {
pure fn iter_bytes(&self, +lsb0: bool, f: to_bytes::Cb) {
match *self {
expl(ref t) =>
pure fn ne(&self, other: &span) -> bool { !(*self).eq(other) }
}
-pub impl<S: Encoder> Encodable<S> for span {
+pub impl<S:Encoder> Encodable<S> for span {
/* Note #1972 -- spans are encoded but not decoded */
fn encode(&self, _s: &S) { }
}
-pub impl<D: Decoder> Decodable<D> for span {
+pub impl<D:Decoder> Decodable<D> for span {
static fn decode(_d: &D) -> span {
dummy_sp()
}
}
}
-pub fn expect<T: Copy>(diag: span_handler,
+pub fn expect<T:Copy>(diag: span_handler,
opt: Option<T>,
msg: fn() -> ~str) -> T {
match opt {
would generate two implementations like:
-impl<S: std::serialize::Encoder> Encodable<S> for Node {
+impl<S:std::serialize::Encoder> Encodable<S> for Node {
fn encode(&self, s: &S) {
do s.emit_struct("Node", 1) {
s.emit_field("id", 0, || s.emit_uint(self.id))
}
}
-impl<D: Decoder> Decodable for node_id {
+impl<D:Decoder> Decodable for node_id {
static fn decode(d: &D) -> Node {
do d.read_struct("Node", 1) {
Node {
S: Encoder,
T: Encodable<S>
> spanned<T>: Encodable<S> {
- fn encode<S: Encoder>(s: &S) {
+ fn encode<S:Encoder>(s: &S) {
do s.emit_rec {
s.emit_field("node", 0, || self.node.encode(s));
s.emit_field("span", 1, || self.span.encode(s));
+items: ~[@ast::item]) -> @ast::item {
// XXX: Total hack: import `core::kinds::Owned` to work around a
- // parser bug whereby `fn f<T: ::kinds::Owned>` doesn't parse.
+ // parser bug whereby `fn f<T:::kinds::Owned>` doesn't parse.
let vi = ast::view_item_use(~[
@codemap::spanned {
node: ast::view_path_simple(
// parse a sequence bracketed by '<' and '>', stopping
// before the '>'.
- fn parse_seq_to_before_gt<T: Copy>(sep: Option<token::Token>,
+ fn parse_seq_to_before_gt<T:Copy>(sep: Option<token::Token>,
f: fn(Parser) -> T) -> ~[T] {
let mut first = true;
let mut v = ~[];
return v;
}
- fn parse_seq_to_gt<T: Copy>(sep: Option<token::Token>,
+ fn parse_seq_to_gt<T:Copy>(sep: Option<token::Token>,
f: fn(Parser) -> T) -> ~[T] {
let v = self.parse_seq_to_before_gt(sep, f);
self.expect_gt();
}
// parse a sequence bracketed by '<' and '>'
- fn parse_seq_lt_gt<T: Copy>(sep: Option<token::Token>,
+ fn parse_seq_lt_gt<T:Copy>(sep: Option<token::Token>,
f: fn(Parser) -> T) -> spanned<~[T]> {
let lo = self.span.lo;
self.expect(token::LT);
// parse a sequence, including the closing delimiter. The function
// f must consume tokens until reaching the next separator or
// closing bracket.
- fn parse_seq_to_end<T: Copy>(ket: token::Token, sep: seq_sep,
+ fn parse_seq_to_end<T:Copy>(ket: token::Token, sep: seq_sep,
f: fn(Parser) -> T) -> ~[T] {
let val = self.parse_seq_to_before_end(ket, sep, f);
self.bump();
// parse a sequence, not including the closing delimiter. The function
// f must consume tokens until reaching the next separator or
// closing bracket.
- fn parse_seq_to_before_end<T: Copy>(ket: token::Token, sep: seq_sep,
+ fn parse_seq_to_before_end<T:Copy>(ket: token::Token, sep: seq_sep,
f: fn(Parser) -> T) -> ~[T] {
let mut first: bool = true;
let mut v: ~[T] = ~[];
// parse a sequence, including the closing delimiter. The function
// f must consume tokens until reaching the next separator or
// closing bracket.
- fn parse_unspanned_seq<T: Copy>(bra: token::Token,
+ fn parse_unspanned_seq<T:Copy>(bra: token::Token,
ket: token::Token,
sep: seq_sep,
f: fn(Parser) -> T) -> ~[T] {
// NB: Do not use this function unless you actually plan to place the
// spanned list in the AST.
- fn parse_seq<T: Copy>(bra: token::Token, ket: token::Token, sep: seq_sep,
+ fn parse_seq<T:Copy>(bra: token::Token, ket: token::Token, sep: seq_sep,
f: fn(Parser) -> T) -> spanned<~[T]> {
let lo = self.span.lo;
self.expect(bra);
//use util;
use util::testing::check_equal;
- fn string_check<T : Eq> (given : &T, expected: &T) {
+ fn string_check<T:Eq> (given : &T, expected: &T) {
if !(given == expected) {
fail!(fmt!("given %?, expected %?",given,expected));
}
}
// when traits can extend traits, we should extend index<uint,T> to get []
-pub impl<T: Eq IterBytes Hash Const Copy> Interner<T> {
+pub impl<T:Eq + IterBytes + Hash + Const + Copy> Interner<T> {
static fn new() -> Interner<T> {
Interner {
map: LinearMap::new(),
// support for test cases.
use core::cmp;
-pub pure fn check_equal_ptr<T : cmp::Eq> (given : &T, expected: &T) {
+pub pure fn check_equal_ptr<T:cmp::Eq> (given : &T, expected: &T) {
if !((given == expected) && (expected == given )) {
fail!(fmt!("given %?, expected %?",given,expected));
}
}
-pub pure fn check_equal<T : cmp::Eq> (given : T, expected: T) {
+pub pure fn check_equal<T:cmp::Eq> (given : T, expected: T) {
if !((given == expected) && (expected == given )) {
fail!(fmt!("given %?, expected %?",given,expected));
}
use core::pipes::*;
-pub fn foo<T: Owned Copy>(x: T) -> Port<T> {
+pub fn foo<T:Owned + Copy>(x: T) -> Port<T> {
let (p, c) = stream();
do task::spawn() {
c.send(x);
pub struct alist<A,B> { eq_fn: fn@(A,A) -> bool, data: DVec<Entry<A,B>> }
-pub fn alist_add<A:
Copy, B: Copy>(lst: alist<A,B>, k: A, v: B) {
+pub fn alist_add<A:
Copy,B:Copy>(lst: alist<A,B>, k: A, v: B) {
lst.data.push(Entry{key:k, value:v});
}
-pub fn alist_get<A:
Copy, B: Copy>(lst: alist<A,B>, k: A) -> B {
+pub 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; }
}
#[inline]
-pub fn new_int_alist<B: Copy>() -> alist<int, B> {
+pub fn new_int_alist<B:Copy>() -> alist<int, B> {
fn eq_int(&&a: int, &&b: int) -> bool { a == b }
return alist {eq_fn: eq_int, data: DVec()};
}
#[inline]
-pub fn new_int_alist_2<B: Copy>() -> alist<int, B> {
+pub fn new_int_alist_2<B:Copy>() -> alist<int, B> {
#[inline]
fn eq_int(&&a: int, &&b: int) -> bool { a == b }
return alist {eq_fn: eq_int, data: DVec()};
fn finalize(&self) {}
}
-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)
}
pub type header_map = HashMap<~str, @DVec<@~str>>;
// the unused ty param is necessary so this gets monomorphized
-pub fn request<T: Copy>(req: header_map) {
+pub fn request<T:Copy>(req: header_map) {
let _x = copy *(copy *req.get(&~"METHOD"))[0u];
}
// option. This file may not be copied, modified, or distributed
// except according to those terms.
-pub fn to_closure<A: Durable Copy>(x: A) -> @fn() -> A {
+pub fn to_closure<A:Durable + Copy>(x: A) -> @fn() -> A {
fn@() -> A { copy x }
}
}
}
-pub fn read<T: read Copy>(s: ~str) -> T {
+pub fn read<T:read + Copy>(s: ~str) -> T {
match read::readMaybe(s) {
Some(x) => x,
_ => fail!(~"read failed!")
trait Quux: Foo Bar Baz { }
-impl<T: Foo Bar Baz> Quux for T { }
+impl<T:Foo + Bar + Baz> Quux for T { }
}
impl Results {
- fn bench_int<T: Set<uint>>(&mut self, rng: @rand::Rng, num_keys: uint,
+ fn bench_int<T:Set<uint>>(&mut self, rng: @rand::Rng, num_keys: uint,
rand_cap: uint, f: fn() -> T) {
{
let mut set = f();
}
}
- fn bench_str<T: Set<~str>>(&mut self, rng: @rand::Rng, num_keys: uint,
+ fn bench_str<T:Set<~str>>(&mut self, rng: @rand::Rng, num_keys: uint,
f: fn() -> T) {
{
let mut set = f();
)
)
-fn switch<T: Owned, Tb: Owned, U>(+endp: pipes::RecvPacketBuffered<T, Tb>,
+fn switch<T:Owned,Tb:Owned,U>(+endp: pipes::RecvPacketBuffered<T, Tb>,
f: fn(+v: Option<T>) -> U) -> U {
f(pipes::try_recv(endp))
}
return (xx as float) * 100f / (yy as float);
}
- pure fn le_by_val<TT: Copy, UU: Copy Ord>(kv0: &(TT,UU),
+ pure fn le_by_val<TT:Copy,UU:Copy + Ord>(kv0: &(TT,UU),
kv1: &(TT,UU)) -> bool {
let (_, v0) = *kv0;
let (_, v1) = *kv1;
return v0 >= v1;
}
- pure fn le_by_key<TT: Copy Ord, UU: Copy>(kv0: &(TT,UU),
+ pure fn le_by_key<TT:Copy + Ord,UU:Copy>(kv0: &(TT,UU),
kv1: &(TT,UU)) -> bool {
let (k0, _) = *kv0;
let (k1, _) = *kv1;
}
// sort by key, then by value
- fn sortKV<TT: Copy Ord, UU: Copy Ord>(orig: ~[(TT,UU)]) -> ~[(TT,UU)] {
+ fn sortKV<TT:Copy + Ord,UU:Copy + Ord>(orig: ~[(TT,UU)]) -> ~[(TT,UU)] {
return sort::merge_sort(sort::merge_sort(orig, le_by_key), le_by_val);
}
trait A { fn foo(); }
trait B { fn foo(); }
-fn foo<T: A B>(t: T) {
+fn foo<T:A + B>(t: T) {
t.foo(); //~ ERROR multiple applicable methods in scope
//~^ NOTE candidate #1 derives from the bound `A`
//~^^ NOTE candidate #2 derives from the bound `B`
use iter::BaseIter;
trait A {
- fn b<C:Copy Const, D>(x: C) -> C;
+ fn b<C:Copy + Const,D>(x: C) -> C;
}
struct E {
}
impl A for E {
- 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() {}
use iter::BaseIter;
trait A {
- fn b<C:Copy, D>(x: C) -> C;
+ fn b<C:Copy,D>(x: C) -> C;
}
struct E {
}
impl A for E {
- 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() {}
use iter::BaseIter;
trait A {
- fn b<C:Copy, D>(x: C) -> C;
+ fn b<C:Copy,D>(x: C) -> C;
}
struct E {
impl A for E {
// 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() {}
// except according to those terms.
pub mod stream {
- pub enum Stream<T: Owned> { send(T, ::stream::server::Stream<T>), }
+ pub enum Stream<T:Owned> { send(T, ::stream::server::Stream<T>), }
pub mod server {
use core::option;
use core::pipes;
- impl<T: Owned> Stream<T> {
+ impl<T:Owned> Stream<T> {
pub fn recv() -> extern fn(+v: Stream<T>) -> ::stream::Stream<T> {
// resolve really should report just one error here.
// Change the test case when it changes.
}
}
- pub type Stream<T: Owned> = pipes::RecvPacket<::stream::Stream<T>>;
+ pub type Stream<T:Owned> = pipes::RecvPacket<::stream::Stream<T>>;
}
}
// xfail-test
// error-pattern: instantiating a type parameter with an incompatible type
-struct S<T: Const> {
+struct S<T:Const> {
s: T,
mut cant_nest: ()
}
{f:t} as foo //~ ERROR value may contain borrowed pointers; use `&static` bound
}
-fn to_foo_3<T:Copy &static>(t: T) -> foo {
+fn to_foo_3<T:Copy + &static>(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
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 `&static` bound
}
-fn to_foo2<T: Copy foo &static>(t: T) -> foo {
+fn to_foo2<T:Copy + foo + &static>(t: T) -> foo {
t as foo
}
// option. This file may not be copied, modified, or distributed
// except according to those terms.
-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 &static>(t: T) -> fn@() -> T {
+fn copy2<T:Copy + &static>(t: T) -> fn@() -> T {
fn@() -> T { t }
}
// option. This file may not be copied, modified, or distributed
// except according to those terms.
-fn send<T: Owned>(ch: _chan<T>, -data: T) {
+fn send<T:Owned>(ch: _chan<T>, -data: T) {
log(debug, ch);
log(debug, data);
fail!();
// Test that various non const things are rejected.
-fn foo<T: Const>(_x: T) { }
+fn foo<T:Const>(_x: T) { }
struct r {
x:int,
// option. This file may not be copied, modified, or distributed
// except according to those terms.
-fn f1<T: copy>() -> T { }
+fn f1<T:copy>() -> T { }
//~^ ERROR obsolete syntax: lower-case kind bounds
-fn f1<T: send>() -> T { }
+fn f1<T:send>() -> T { }
//~^ ERROR obsolete syntax: lower-case kind bounds
-fn f1<T: const>() -> T { }
+fn f1<T:const>() -> T { }
//~^ ERROR obsolete syntax: lower-case kind bounds
-fn f1<T: owned>() -> T { }
+fn f1<T:owned>() -> T { }
//~^ ERROR obsolete syntax: lower-case kind bounds
struct s {
}
}
-fn with<R: deref>(f: fn(x: &int) -> R) -> int {
+fn with<R:deref>(f: fn(x: &int) -> R) -> int {
f(&3).get()
}
// option. This file may not be copied, modified, or distributed
// except according to those terms.
-fn f<T: Owned>(_i: T) {
+fn f<T:Owned>(_i: T) {
}
fn main() {
// option. This file may not be copied, modified, or distributed
// except according to those terms.
-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:
}
trait TraitB {
- fn gimme_an_a<A: TraitA>(a: A) -> int;
+ fn gimme_an_a<A:TraitA>(a: A) -> int;
}
impl TraitB for int {
- fn gimme_an_a<A: TraitA>(a: A) -> int {
+ fn gimme_an_a<A:TraitA>(a: A) -> int {
a.method_a() + self
}
}
-fn call_it<B: TraitB>(b: B) -> int {
+fn call_it<B:TraitB>(b: B) -> int {
let y = 4u;
b.gimme_an_a(y) //~ ERROR failed to find an implementation of trait @TraitA
}
enum chan_t<T> = {task: task_id, port: port_id};
-fn send<T: Owned>(ch: chan_t<T>, data: T) { fail!(); }
+fn send<T:Owned>(ch: chan_t<T>, data: T) { fail!(); }
fn main() { fail!(~"quux"); }
a: A, b: B
};
-fn f<A:Copy &static>(a: A, b: u16) -> fn@() -> (A, u16) {
+fn f<A:Copy + &static>(a: A, b: u16) -> fn@() -> (A, u16) {
fn@() -> (A, u16) { (a, b) }
}
g.rec = Some(g);
}
-fn f<A:Owned Copy, B:Owned Copy>(a: A, b: B) -> fn@() -> (A, B) {
+fn f<A:Owned + Copy,B:Owned + Copy>(a: A, b: B) -> fn@() -> (A, B) {
fn@() -> (A, B) { (a, b) }
}
use std::prettyprint;
use std::time;
-fn test_prettyprint<A:
Encodable<prettyprint::Serializer>>(
+fn test_prettyprint<A:Encodable<prettyprint::Serializer>>(
a: &A,
expected: &~str
) {
struct Pair<T, U> { a: T, b: U }
struct Triple { x: int, y: int, z: int }
-fn f<T: Copy, U: Copy>(x: T, y: U) -> Pair<T, U> { return Pair {a: x, b: y}; }
+fn f<T:Copy,U:Copy>(x: T, y: U) -> Pair<T, U> { return Pair {a: x, b: y}; }
pub fn main() {
log(debug, f(Triple {x: 3, y: 4, z: 5}, 4).a.x);
// option. This file may not be copied, modified, or distributed
// except according to those terms.
-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]); }
fn double() -> uint { self * 2u }
}
-fn is_equal<D: double>(x: @D, exp: uint) {
+fn is_equal<D:double>(x: @D, exp: uint) {
assert x.double() == exp;
}
fn foo(&self) -> ~str;
}
-impl<T: Foo> Foo for @T {
+impl<T:Foo> Foo for @T {
fn foo(&self) -> ~str {
fmt!("@%s", (**self).foo())
}
// option. This file may not be copied, modified, or distributed
// except according to those terms.
-fn foo<T: Copy>(x: &T) -> T{
+fn foo<T:Copy>(x: &T) -> T{
match x {
&a => a
}
struct Box<T> {c: @T}
-fn unbox<T: Copy>(b: Box<T>) -> T { return *b.c; }
+fn unbox<T:Copy>(b: Box<T>) -> T { return *b.c; }
pub fn main() {
let foo: int = 17;
use core::to_str::ToStr;
use cci_class_cast::kitty::*;
-fn print_out<T: ToStr>(thing: T, expected: ~str) {
+fn print_out<T:ToStr>(thing: T, expected: ~str) {
let actual = thing.to_str();
debug!("%s", actual);
assert(actual == expected);
fn to_str() -> str { self.name }
}
-fn print_out<T: to_str>(thing: T, expected: str) {
+fn print_out<T:to_str>(thing: T, expected: str) {
let actual = thing.to_str();
debug!("%s", actual);
assert(actual == expected);
}
-fn annoy_neighbors<T: noisy>(critter: T) {
+fn annoy_neighbors<T:noisy>(critter: T) {
for uint::range(0u, 10u) |i| { critter.speak(); }
}
}
-fn make_speak<C: noisy>(c: C) {
+fn make_speak<C:noisy>(c: C) {
c.speak();
}
}
}
-fn annoy_neighbors<T: noisy>(critter: T) {
+fn annoy_neighbors<T:noisy>(critter: T) {
for uint::range(0u, 10u) |i| {
let what = critter.speak();
debug!("%u %d", i, what);
}
}
-fn bite_everything<T: bitey>(critter: T) -> bool {
+fn bite_everything<T:bitey>(critter: T) -> bool {
let mut left : ~[body_part] = ~[finger, toe, nose, ear];
while vec::len(left) > 0u {
let part = critter.bite();
true
}
-fn scratched_something<T: scratchy>(critter: T) -> bool {
+fn scratched_something<T:scratchy>(critter: T) -> bool {
option::is_some(critter.scratch())
}
pure fn to_str(&self) -> ~str { copy self.name }
}
-fn print_out<T: ToStr>(thing: T, expected: ~str) {
+fn print_out<T:ToStr>(thing: T, expected: ~str) {
let actual = thing.to_str();
debug!("%s", actual);
assert(actual == expected);
extern mod std;
use std::oldmap::{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;
a: A, b: B
};
-fn f<A:Copy &static>(a: A, b: u16) -> fn@() -> (A, u16) {
+fn f<A:Copy + &static>(a: A, b: u16) -> fn@() -> (A, u16) {
fn@() -> (A, u16) { (a, b) }
}
// are const.
-fn foo<T: Copy Const>(x: T) -> T { x }
+fn foo<T:Copy + Const>(x: T) -> T { x }
struct F { field: int }
fn read_bytes(&self, len: uint);
}
-impl<T: Reader> ReaderUtil for T {
+impl<T:Reader> ReaderUtil for T {
fn read_bytes(&self, len: uint) {
let mut count = self.read(&mut [0], len);
fn read_bytes(&self, len: uint);
}
-impl<T: Reader> ReaderUtil for T {
+impl<T:Reader> ReaderUtil for T {
fn read_bytes(&self, len: uint) {
let mut count = self.read(&mut [0], len);
fn read_bytes(len: uint);
}
-impl<T: Reader> ReaderUtil for T {
+impl<T:Reader> ReaderUtil for T {
fn read_bytes(len: uint) {
let mut count = self.read(&mut [0], len);
fn read_bytes(len: uint);
}
-impl<T: Reader> ReaderUtil for T {
+impl<T:Reader> ReaderUtil for T {
fn read_bytes(len: uint) {
let mut count = self.read(&mut [0], len);
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));
}
// -*- 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 => { copy expected },
_ => fail!(~"wat")
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 => copy expected,
_ => fail!(~"wat")
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));
}
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));
}
// -*- 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 = { copy expected };
assert (eq(expected, actual));
}
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));
}
// 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));
}
}
fn test_generic() {
- fn f<T: Copy>(t: T) -> T { t }
+ fn f<T:Copy>(t: T) -> T { t }
assert (f(10) == 10);
}
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));
}
// 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));
}
// xfail-fast
#[legacy_modes];
-fn fix_help<A: &static, B: Owned>(f: extern fn(fn@(A) -> B, A) -> B, x: A) -> B {
+fn fix_help<A:&static,B:Owned>(f: extern fn(fn@(A) -> B, A) -> B, x: A) -> B {
return f(|a| fix_help(f, a), x);
}
-fn fix<A: &static, B: Owned>(f: extern fn(fn@(A) -> B, A) -> B) -> fn@(A) -> B {
+fn fix<A:&static,B:Owned>(f: extern fn(fn@(A) -> B, A) -> B) -> fn@(A) -> B {
return |a| fix_help(f, a);
}
// This is what the signature to spawn should look like with bare functions
-fn spawn<T: Owned>(val: T, f: extern fn(T)) {
+fn spawn<T:Owned>(val: T, f: extern fn(T)) {
f(val);
}
-fn id<T: Copy>(t: T) -> T { return t; }
+fn id<T:Copy>(t: T) -> T { return t; }
pub fn main() {
let expected = @100;
-fn id<T: Copy Owned>(t: T) -> T { return t; }
+fn id<T:Copy + Owned>(t: T) -> T { return t; }
pub fn main() {
let expected = ~100;
-fn box<T: Copy>(x: Box<T>) -> @Box<T> { return @x; }
+fn box<T:Copy>(x: Box<T>) -> @Box<T> { return @x; }
struct Box<T> {x: T, y: T, z: T}
-fn g<X: Copy>(x: X) -> X { return x; }
+fn g<X:Copy>(x: X) -> X { return x; }
struct Pair<T> {a: T, b: T}
-fn f<T: Copy>(t: T) -> Pair<T> {
+fn f<T:Copy>(t: T) -> Pair<T> {
let x: Pair<T> = Pair {a: t, b: t};
return g::<Pair<T>>(x);
struct Pair { x: @int, y: @int }
-fn f<T: Copy>(t: T) { let t1: T = t; }
+fn f<T:Copy>(t: T) { let t1: T = t; }
pub fn main() { let x = Pair {x: @10, y: @12}; f(x); }
struct Recbox<T> {x: @T}
-fn reclift<T: Copy>(t: T) -> Recbox<T> { return Recbox {x: @t}; }
+fn reclift<T:Copy>(t: T) -> Recbox<T> { return Recbox {x: @t}; }
pub fn main() {
let foo: int = 17;
struct Recbox<T> {x: ~T}
-fn reclift<T: Copy>(t: T) -> Recbox<T> { return Recbox {x: ~t}; }
+fn reclift<T:Copy>(t: T) -> Recbox<T> { return Recbox {x: ~t}; }
pub fn main() {
let foo: int = 17;
// -*- 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; }
pub fn main() { let x: int = 42; let y: int = id(x); assert (x == y); }
// except according to those terms.
-fn f<T: Copy>(x: ~T) -> ~T { return x; }
+fn f<T:Copy>(x: ~T) -> ~T { return x; }
pub fn main() { let x = f(~3); log(debug, *x); }
// -*- rust -*-
-fn id<T: Copy>(x: T) -> T { return x; }
+fn id<T:Copy>(x: T) -> T { return x; }
struct Triple {x: int, y: int, z: int}
// option. This file may not be copied, modified, or distributed
// except according to those terms.
-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; }
pub fn main() {
log(debug, get_third((1, 2, 3)));
struct Triple<T> { x: T, y: T, z: T }
-fn box<T: Copy>(x: Triple<T>) -> ~Triple<T> { return ~x; }
+fn box<T:Copy>(x: Triple<T>) -> ~Triple<T> { return ~x; }
pub fn main() {
let x: ~Triple<int> = box::<int>(Triple{x: 1, y: 2, z: 3});
fn f();
}
-fn f<T: Send>(t: T) {
+fn f<T:Send>(t: T) {
t.f();
}
// option. This file may not be copied, modified, or distributed
// except according to those terms.
-trait clam<A: Copy> {
+trait clam<A:Copy> {
fn chowder(y: A);
}
struct foo<A> {
x: A,
}
-impl<A:
Copy> clam<A> for foo<A> {
+impl<A:Copy> clam<A> for foo<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);
}
// option. This file may not be copied, modified, or distributed
// except according to those terms.
-trait clam<A: Copy> { }
+trait clam<A:Copy> { }
struct foo<A> {
x: A,
}
+impl<A:Copy> foo<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
}
x: T,
}
-impl<T: Copy> c1<T> {
+impl<T:Copy> c1<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) {
}
}
x: T,
}
-impl<T: Copy> c1<T> {
+impl<T:Copy> c1<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) {}
}
mut payload: Option<T>
};
- pub fn packet<T: Owned>() -> *packet<T> {
+ pub fn packet<T:Owned>() -> *packet<T> {
unsafe {
let p: *packet<T> = cast::transmute(~Stuff{
mut state: empty,
}
}
- pub fn send<T: Owned>(-p: send_packet<T>, -payload: T) {
+ pub fn send<T:Owned>(-p: send_packet<T>, -payload: T) {
let p = p.unwrap();
let p = unsafe { uniquify(p) };
assert (*p).payload.is_none();
}
}
- pub fn recv<T: Owned>(-p: recv_packet<T>) -> Option<T> {
+ pub fn recv<T:Owned>(-p: recv_packet<T>) -> Option<T> {
let p = p.unwrap();
let p = unsafe { uniquify(p) };
loop {
}
}
- pub fn sender_terminate<T: Owned>(p: *packet<T>) {
+ pub fn sender_terminate<T:Owned>(p: *packet<T>) {
let p = unsafe { uniquify(p) };
match swap_state_rel(&mut (*p).state, terminated) {
empty | blocked => {
}
}
- pub fn receiver_terminate<T: Owned>(p: *packet<T>) {
+ pub fn receiver_terminate<T:Owned>(p: *packet<T>) {
let p = unsafe { uniquify(p) };
match swap_state_rel(&mut (*p).state, terminated) {
empty => {
mut p: Option<*packet<T>>,
}
- pub impl<T: Owned> Drop for send_packet<T> {
+ pub impl<T:Owned> Drop for send_packet<T> {
fn finalize(&self) {
if self.p != None {
let mut p = None;
}
}
- pub impl<T: Owned> send_packet<T> {
+ pub impl<T:Owned> send_packet<T> {
fn unwrap() -> *packet<T> {
let mut p = None;
p <-> self.p;
}
}
- pub fn send_packet<T: Owned>(p: *packet<T>) -> send_packet<T> {
+ pub fn send_packet<T:Owned>(p: *packet<T>) -> send_packet<T> {
send_packet {
p: Some(p)
}
mut p: Option<*packet<T>>,
}
- pub impl<T: Owned> Drop for recv_packet<T> {
+ pub impl<T:Owned> Drop for recv_packet<T> {
fn finalize(&self) {
if self.p != None {
let mut p = None;
}
}
- pub impl<T: Owned> recv_packet<T> {
+ pub impl<T:Owned> recv_packet<T> {
fn unwrap() -> *packet<T> {
let mut p = None;
p <-> self.p;
}
}
- pub fn recv_packet<T: Owned>(p: *packet<T>) -> recv_packet<T> {
+ pub fn recv_packet<T:Owned>(p: *packet<T>) -> recv_packet<T> {
recv_packet {
p: Some(p)
}
}
- pub fn entangle<T: Owned>() -> (send_packet<T>, recv_packet<T>) {
+ pub fn entangle<T:Owned>() -> (send_packet<T>, recv_packet<T>) {
let p = packet();
(send_packet(p), recv_packet(p))
}
trait hax { }
impl<A> hax for A { }
-fn perform_hax<T: &static>(x: @T) -> hax {
+fn perform_hax<T:&static>(x: @T) -> hax {
x as hax
}
trait hax { }
impl<A> hax for A { }
-fn perform_hax<T: &static>(x: @T) -> hax {
+fn perform_hax<T:&static>(x: @T) -> hax {
x as hax
}
//
proto! streamp (
- open:send<T: Owned> {
+ open:send<T:Owned> {
data(T) -> open<T>
}
)
fn double() -> uint { self * 2u }
}
-fn is_equal<D: double>(x: @D, exp: uint) {
+fn is_equal<D:double>(x: @D, exp: uint) {
assert x.double() == exp;
}
// option. This file may not be copied, modified, or distributed
// except according to those terms.
-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; }
pub fn main() { assert (quux(10) == 10); }
// except according to those terms.
// xfail-test
-type IMap<K: Copy, V: Copy> = ~[(K, V)];
+type IMap<K:Copy,V:Copy> = ~[(K, V)];
-trait ImmutableMap<K: Copy, V: Copy>
+trait ImmutableMap<K:Copy,V:Copy>
{
pure fn contains_key(key: K) -> bool;
}
-impl<K: Copy, V: Copy> IMap<K, V> : ImmutableMap<K, V>
+impl<K:Copy,V:Copy> IMap<K, V> : ImmutableMap<K, V>
{
pure fn contains_key(key: K) -> bool
{
trait JD : Deserializable<json::Deserializer> { }
//type JD = Deserializable<json::Deserializer>;
-fn exec<T: JD>() {
+fn exec<T:JD>() {
let doc = result::unwrap(json::from_str(""));
let _v: T = deserialize(&json::Deserializer(doc));
fail!()
// option. This file may not be copied, modified, or distributed
// except according to those terms.
-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]; }
#[legacy_modes];
trait vec_monad<A> {
- fn bind<B: Copy>(f: fn(A) -> ~[B]) -> ~[B];
+ fn bind<B:Copy>(f: fn(A) -> ~[B]) -> ~[B];
}
impl<A> vec_monad<A> for ~[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
}
trait Serializable {
- fn serialize<S: Serializer>(s: S);
+ fn serialize<S:Serializer>(s: S);
}
impl Serializable for int {
- fn serialize<S: Serializer>(_s: S) { }
+ fn serialize<S:Serializer>(_s: S) { }
}
struct F<A> { a: A }
-impl<A:
Copy Serializable> Serializable for F<A> {
- fn serialize<S: Serializer>(s: S) {
+impl<A:
Copy + Serializable> Serializable for F<A> {
+ fn serialize<S:Serializer>(s: S) {
self.a.serialize(s);
}
}
enum myvec<X> = ~[X];
-fn myvec_deref<X: Copy>(mv: myvec<X>) -> ~[X] { return copy *mv; }
+fn myvec_deref<X:Copy>(mv: myvec<X>) -> ~[X] { return copy *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]; }
pub fn main() {
let mv = myvec(~[1, 2, 3]);
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_empty(ls);
return head(ls);
}
{ $x:expr } => { unsafe { let y = *ptr::addr_of(&($x)); y } }
)
-fn switch<T: Owned, U>(+endp: pipes::RecvPacket<T>,
+fn switch<T:Owned,U>(+endp: pipes::RecvPacket<T>,
f: fn(+v: Option<T>) -> U) -> U {
f(pipes::try_recv(endp))
}
enum ptr_visit_adaptor<V> = Inner<V>;
-impl<V: TyVisitor movable_ptr> ptr_visit_adaptor<V> {
+impl<V:TyVisitor + movable_ptr> ptr_visit_adaptor<V> {
#[inline(always)]
fn bump(sz: uint) {
}
-impl<V: TyVisitor movable_ptr> TyVisitor for ptr_visit_adaptor<V> {
+impl<V:TyVisitor + movable_ptr> TyVisitor for ptr_visit_adaptor<V> {
fn visit_bot(&self) -> bool {
self.align_to::<()>();
arg: Arg<T>
}
-impl<T: Copy> Drop for finish<T> {
+impl<T:Copy> Drop for finish<T> {
fn finalize(&self) {
(self.arg.fin)(self.arg.val);
}
}
-fn finish<T: Copy>(arg: Arg<T>) -> finish<T> {
+fn finish<T:Copy>(arg: Arg<T>) -> finish<T> {
finish {
arg: arg
}
}
}
-fn find_pos<T:Eq Copy>(n: T, h: ~[T]) -> Option<uint> {
+fn find_pos<T:Eq + Copy>(n: T, h: ~[T]) -> Option<uint> {
let mut i = 0u;
for iter(copy h) |e| {
if e == n { return Some(i); }
enum option<T> { none, some(T), }
-fn f<T: Copy>() -> option<T> { return none; }
+fn f<T:Copy>() -> option<T> { return none; }
pub fn main() { f::<int>(); }
// tests that ctrl's type gets inferred properly
type command<K, V> = {key: K, val: V};
-fn cache_server<K: Owned, V: Owned>(c: Chan<Chan<command<K, V>>>) {
+fn cache_server<K:Owned,V:Owned>(c: Chan<Chan<command<K, V>>>) {
let (ctrl_port, ctrl_chan) = stream();
c.send(ctrl_chan);
}
struct 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 Pair {a: a, b: b};
}
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);
};
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> vec_utils<T> for ~[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
fn read_int() -> int;
}
-trait Deserializable<D: Deserializer> {
+trait Deserializable<D:Deserializer> {
static fn deserialize(d: &D) -> Self;
}
-impl<D: Deserializer> Deserializable<D> for int {
+impl<D:Deserializer> Deserializable<D> for int {
static fn deserialize(d: &D) -> int {
return d.read_int();
}
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 {
bool_like::select(x1, x2, x1)
}
}
}
-fn seq_range<BT: buildable<int>>(lo: uint, hi: uint) -> BT {
+fn seq_range<BT:buildable<int>>(lo: uint, hi: uint) -> BT {
do buildable::build_sized(hi-lo) |push| {
for uint::range(lo, hi) |i| {
push(i as int);
fn read() -> int;
}
-trait connection_factory<C: connection> {
+trait connection_factory<C:connection> {
fn create() -> C;
}
fn to_str() -> ~str;
}
-impl<T: to_str> to_str for Option<T> {
+impl<T:to_str> to_str for Option<T> {
fn to_str() -> ~str {
match self {
None => { ~"none" }
}
}
-fn foo<T: to_str>(x: T) -> ~str { x.to_str() }
+fn foo<T:to_str>(x: T) -> ~str { x.to_str() }
pub fn main() {
let t1 = Tree(@TreeR{mut left: None,
impl A for int { }
-fn f<T: A>(i: T) {
+fn f<T:A>(i: T) {
assert i.g() == 10;
}
}
trait map<T> {
- fn map<U: Copy>(f: fn(T) -> U) -> ~[U];
+ fn map<U:Copy>(f: fn(T) -> U) -> ~[U];
}
impl<T> map<T> for ~[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
fn foo<U, T: map<U>>(x: T) -> ~[~str] {
x.map(|_e| ~"hi" )
}
-fn bar<U: to_str, T: map<U>>(x: T) -> ~[~str] {
+fn bar<U:to_str,T:map<U>>(x: T) -> ~[~str] {
x.map(|_e| _e.to_str() )
}
// We want to extend all Foo, Bar, Bazes to Quuxes
pub trait Quux: Foo Bar Baz { }
-impl<T: Foo Bar Baz> Quux for T { }
+impl<T:Foo + Bar + Baz> Quux for T { }
-fn f<T: Quux>(a: &T) {
+fn f<T:Quux>(a: &T) {
assert a.f() == 10;
assert a.g() == 20;
assert a.h() == 30;
impl Bar for A { fn g() -> int { 20 } }
impl Baz for A { fn h() -> int { 30 } }
-fn f<T: Quux>(a: &T) {
+fn f<T:Quux>(a: &T) {
assert a.f() == 10;
assert a.g() == 20;
assert a.h() == 30;
// Testing that this impl turns A into a Quux, because
// A is already a Foo Bar Baz
-impl<T: Foo Bar Baz> Quux for T { }
+impl<T:Foo + Bar + Baz> Quux for T { }
trait Foo { fn f() -> int; }
trait Bar { fn g() -> int; }
impl Bar for A { fn g() -> int { 20 } }
impl Baz for A { fn h() -> int { 30 } }
-fn f<T: Quux>(a: &T) {
+fn f<T:Quux>(a: &T) {
assert a.f() == 10;
assert a.g() == 20;
assert a.h() == 30;
// Call a function on Foo, given a T: Baz,
// which is inherited via Bar
-fn gg<T: Baz>(a: &T) -> int {
+fn gg<T:Baz>(a: &T) -> int {
a.f()
}
impl C for S { fn c(&self) -> int { 30 } }
impl D for S { fn d(&self) -> int { 40 } }
-fn f<T: D>(x: &T) {
+fn f<T:D>(x: &T) {
assert x.a() == 10;
assert x.b() == 20;
assert x.c() == 30;
impl C for S { fn c(&self) -> int { 30 } }
// Both B and C inherit from A
-fn f<T: B C>(x: &T) {
+fn f<T:B + C>(x: &T) {
assert x.a() == 10;
assert x.b() == 20;
assert x.c() == 30;
impl C for S { fn c(&self) -> int { 30 } }
// Multiple type params, multiple levels of inheritance
-fn f<X: A, Y: B, Z: C>(x: &X, y: &Y, z: &Z) {
+fn f<X:A,Y:B,Z:C>(x: &X, y: &Y, z: &Z) {
assert x.a() == 10;
assert y.a() == 10;
assert y.b() == 20;
extern mod trait_inheritance_overloading_xc;
use trait_inheritance_overloading_xc::{MyNum, MyInt};
-fn f<T:Copy MyNum>(x: T, y: T) -> (T, T, T) {
+fn f<T:Copy + MyNum>(x: T, y: T) -> (T, T, T) {
return (x + y, x - y, x * y);
}
impl MyNum for MyInt;
-fn f<T:Copy MyNum>(x: T, y: T) -> (T, T, T) {
+fn f<T:Copy + MyNum>(x: T, y: T) -> (T, T, T) {
return (x + y, x - y, x * y);
}
}
trait Quux: traits::Foo { }
-impl<T: traits::Foo> Quux for T { }
+impl<T:traits::Foo> Quux for T { }
// Foo is not in scope but because Quux is we can still access
// Foo's methods on a Quux bound typaram
-fn f<T: Quux>(x: &T) {
+fn f<T:Quux>(x: &T) {
assert x.f() == 10;
}
impl Baz for A { fn h() -> int { 30 } }
impl Quux for A;
-fn f<T: Quux Foo Bar Baz>(a: &T) {
+fn f<T:Quux + Foo + Bar + Baz>(a: &T) {
assert a.f() == 10;
assert a.g() == 20;
assert a.h() == 30;
fn to_str() -> ~str { int::str(self) }
}
-impl<T: to_str> to_str for ~[T] {
+impl<T:to_str> to_str for ~[T] {
fn to_str() -> ~str {
~"[" + str::connect(vec::map(self, |e| e.to_str() ), ~", ") + ~"]"
}
assert 1.to_str() == ~"1";
assert (~[2, 3, 4]).to_str() == ~"[2, 3, 4]";
- fn indirect<T: to_str>(x: T) -> ~str {
+ fn indirect<T:to_str>(x: T) -> ~str {
x.to_str() + ~"!"
}
assert indirect(~[10, 20]) == ~"[10, 20]!";
- fn indirect2<T: to_str>(x: T) -> ~str {
+ fn indirect2<T:to_str>(x: T) -> ~str {
indirect(x)
}
assert indirect2(~[1]) == ~"[1]!";
#[legacy_modes];
fn p_foo<T>(pinned: T) { }
-fn s_foo<T: Copy>(shared: T) { }
-fn u_foo<T: Owned>(unique: T) { }
+fn s_foo<T:Copy>(shared: T) { }
+fn u_foo<T:Owned>(unique: T) { }
struct r {
i: int,
d : fn~() -> uint,
}
-fn make_uniq_closure<A:Owned Copy>(a: A) -> fn~() -> uint {
+fn make_uniq_closure<A:Owned + Copy>(a: A) -> fn~() -> uint {
fn~() -> uint { ptr::addr_of(&a) as uint }
}
// option. This file may not be copied, modified, or distributed
// except according to those terms.
-fn f<T: Copy>(t: T) -> T {
+fn f<T:Copy>(t: T) -> T {
let t1 = t;
t1
}
// Issue #976
-fn f<T: Copy>(x: ~T) {
+fn f<T:Copy>(x: ~T) {
let _x2 = x;
}
pub fn main() { }
fn sendable() {
- fn f<T: Owned Eq>(i: T, j: T) {
+ fn f<T:Owned + Eq>(i: T, j: T) {
assert i == j;
}
- fn g<T: Owned Eq>(i: T, j: T) {
+ fn g<T:Owned + Eq>(i: T, j: T) {
assert i != j;
}
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;
}
fn noncopyable() {
- fn f<T: Eq>(i: T, j: T) {
+ fn f<T:Eq>(i: T, j: T) {
assert i == j;
}
- fn g<T: Eq>(i: T, j: T) {
+ fn g<T:Eq>(i: T, j: T) {
assert i != j;
}
projects / rust.git / commitdiff