Merge commit 'erickt/incoming^' into kind-names

src/libcore/int-template.rs

@@ -98,12 +98,12 @@ impl T: iter::Times {
         will execute the given function exactly x times. If we assume that \
         `x` is an int, this is functionally equivalent to \
         `for int::range(0, x) |_i| { /* anything */ }`."]
-    pure fn times(it: fn() -> bool) {
-        if self < 0 {
+    pure fn times(&self, it: fn() -> bool) {
+        if *self < 0 {
             fail fmt!("The .times method expects a nonnegative number, \
                        but found %?", self);
         }
-        let mut i = self;
+        let mut i = *self;
         while i > 0 {
             if !it() { break }
             i -= 1;

src/libcore/iter-trait.rs

@@ -20,46 +20,53 @@ use cmp::{Eq, Ord};
 use self::inst::{IMPL_T, EACH, SIZE_HINT};
 
 impl<A> IMPL_T<A>: iter::BaseIter<A> {
-    pure fn each(blk: fn(v: &A) -> bool) { EACH(&self, blk) }
-    pure fn size_hint() -> Option<uint> { SIZE_HINT(&self) }
+    pure fn each(&self, blk: fn(v: &A) -> bool) { EACH(self, blk) }
+    pure fn size_hint(&self) -> Option<uint> { SIZE_HINT(self) }
 }
 
 impl<A> IMPL_T<A>: iter::ExtendedIter<A> {
-    pure fn eachi(blk: fn(uint, v: &A) -> bool) { iter::eachi(&self, blk) }
-    pure fn all(blk: fn(&A) -> bool) -> bool { iter::all(&self, blk) }
-    pure fn any(blk: fn(&A) -> bool) -> bool { iter::any(&self, blk) }
-    pure fn foldl<B>(b0: B, blk: fn(&B, &A) -> B) -> B {
-        iter::foldl(&self, move b0, blk)
+    pure fn eachi(&self, blk: fn(uint, v: &A) -> bool) {
+        iter::eachi(self, blk)
     }
-    pure fn position(f: fn(&A) -> bool) -> Option<uint> {
-        iter::position(&self, f)
+    pure fn all(&self, blk: fn(&A) -> bool) -> bool {
+        iter::all(self, blk)
     }
+    pure fn any(&self, blk: fn(&A) -> bool) -> bool {
+        iter::any(self, blk)
+    }
+    pure fn foldl<B>(&self, b0: B, blk: fn(&B, &A) -> B) -> B {
+        iter::foldl(self, move b0, blk)
+    }
+    pure fn position(&self, f: fn(&A) -> bool) -> Option<uint> {
+        iter::position(self, f)
+    }
+    pure fn map_to_vec<B>(&self, op: fn(&A) -> B) -> ~[B] {
+        iter::map_to_vec(self, op)
+    }
+    pure fn flat_map_to_vec<B,IB:BaseIter<B>>(&self, op: fn(&A) -> IB)
+        -> ~[B] {
+        iter::flat_map_to_vec(self, op)
+    }
+
 }
 
 impl<A: Eq> IMPL_T<A>: iter::EqIter<A> {
-    pure fn contains(x: &A) -> bool { iter::contains(&self, x) }
-    pure fn count(x: &A) -> uint { iter::count(&self, x) }
+    pure fn contains(&self, x: &A) -> bool { iter::contains(self, x) }
+    pure fn count(&self, x: &A) -> uint { iter::count(self, x) }
 }
 
 impl<A: Copy> IMPL_T<A>: iter::CopyableIter<A> {
-    pure fn filter_to_vec(pred: fn(a: A) -> bool) -> ~[A] {
-        iter::filter_to_vec(&self, pred)
+    pure fn filter_to_vec(&self, pred: fn(&A) -> bool) -> ~[A] {
+        iter::filter_to_vec(self, pred)
     }
-    pure fn map_to_vec<B>(op: fn(v: A) -> B) -> ~[B] {
-        iter::map_to_vec(&self, op)
+    pure fn to_vec(&self) -> ~[A] { iter::to_vec(self) }
+    pure fn find(&self, f: fn(&A) -> bool) -> Option<A> {
+        iter::find(self, f)
     }
-    pure fn to_vec() -> ~[A] { iter::to_vec(&self) }
-
-    pure fn flat_map_to_vec<B:Copy,IB:BaseIter<B>>(op: fn(a: A) -> IB)
-        -> ~[B] {
-        iter::flat_map_to_vec(&self, op)
-    }
-
-    pure fn find(p: fn(a: A) -> bool) -> Option<A> { iter::find(&self, p) }
 }
 
 impl<A: Copy Ord> IMPL_T<A>: iter::CopyableOrderedIter<A> {
-    pure fn min() -> A { iter::min(&self) }
-    pure fn max() -> A { iter::max(&self) }
+    pure fn min(&self) -> A { iter::min(self) }
+    pure fn max(&self) -> A { iter::max(self) }
 }
 

src/libcore/iter.rs

@@ -23,38 +23,39 @@ use cmp::{Eq, Ord};
 pub type InitOp<T> = &fn(uint) -> T;
 
 pub trait BaseIter<A> {
-    pure fn each(blk: fn(v: &A) -> bool);
-    pure fn size_hint() -> Option<uint>;
+    pure fn each(&self, blk: fn(v: &A) -> bool);
+    pure fn size_hint(&self) -> Option<uint>;
 }
 
 pub trait ExtendedIter<A> {
-    pure fn eachi(blk: fn(uint, v: &A) -> bool);
-    pure fn all(blk: fn(&A) -> bool) -> bool;
-    pure fn any(blk: fn(&A) -> bool) -> bool;
-    pure fn foldl<B>(b0: B, blk: fn(&B, &A) -> B) -> B;
-    pure fn position(f: fn(&A) -> bool) -> Option<uint>;
+    pure fn eachi(&self, blk: fn(uint, v: &A) -> bool);
+    pure fn all(&self, blk: fn(&A) -> bool) -> bool;
+    pure fn any(&self, blk: fn(&A) -> bool) -> bool;
+    pure fn foldl<B>(&self, b0: B, blk: fn(&B, &A) -> B) -> B;
+    pure fn position(&self, f: fn(&A) -> bool) -> Option<uint>;
+    pure fn map_to_vec<B>(&self, op: fn(&A) -> B) -> ~[B];
+    pure fn flat_map_to_vec<B,IB: BaseIter<B>>(&self, op: fn(&A) -> IB)
+        -> ~[B];
 }
 
 pub trait EqIter<A:Eq> {
-    pure fn contains(x: &A) -> bool;
-    pure fn count(x: &A) -> uint;
+    pure fn contains(&self, x: &A) -> bool;
+    pure fn count(&self, x: &A) -> uint;
 }
 
 pub trait Times {
-    pure fn times(it: fn() -> bool);
+    pure fn times(&self, it: fn() -> bool);
 }
 
 pub trait CopyableIter<A:Copy> {
-    pure fn filter_to_vec(pred: fn(a: A) -> bool) -> ~[A];
-    pure fn map_to_vec<B>(op: fn(v: A) -> B) -> ~[B];
-    pure fn flat_map_to_vec<B:Copy,IB: BaseIter<B>>(op: fn(A) -> IB) -> ~[B];
-    pure fn to_vec() -> ~[A];
-    pure fn find(p: fn(a: A) -> bool) -> Option<A>;
+    pure fn filter_to_vec(&self, pred: fn(&A) -> bool) -> ~[A];
+    pure fn to_vec(&self) -> ~[A];
+    pure fn find(&self, p: fn(&A) -> bool) -> Option<A>;
 }
 
 pub trait CopyableOrderedIter<A:Copy Ord> {
-    pure fn min() -> A;
-    pure fn max() -> A;
+    pure fn min(&self) -> A;
+    pure fn max(&self) -> A;
 }
 
 pub trait CopyableNonstrictIter<A:Copy> {
@@ -81,11 +82,11 @@ pub trait Buildable<A> {
      *             onto the sequence being constructed.
      */
      static pure fn build_sized(size: uint,
-                                builder: fn(push: pure fn(v: A))) -> self;
+                                builder: fn(push: pure fn(A))) -> self;
 }
 
 pub pure fn eachi<A,IA:BaseIter<A>>(self: &IA,
-                                    blk: fn(uint, v: &A) -> bool) {
+                                    blk: fn(uint, &A) -> bool) {
     let mut i = 0;
     for self.each |a| {
         if !blk(i, a) { break; }
@@ -110,30 +111,30 @@ pub pure fn any<A,IA:BaseIter<A>>(self: &IA,
 }
 
 pub pure fn filter_to_vec<A:Copy,IA:BaseIter<A>>(
-    self: &IA, prd: fn(a: A) -> bool) -> ~[A] {
+    self: &IA, prd: fn(&A) -> bool) -> ~[A] {
     do vec::build_sized_opt(self.size_hint()) |push| {
         for self.each |a| {
-            if prd(*a) { push(*a); }
+            if prd(a) { push(*a); }
         }
     }
 }
 
-pub pure fn map_to_vec<A:Copy,B,IA:BaseIter<A>>(self: &IA,
-                                                op: fn(v: A) -> B)
+pub pure fn map_to_vec<A,B,IA:BaseIter<A>>(self: &IA,
+                                           op: fn(&A) -> B)
     -> ~[B] {
     do vec::build_sized_opt(self.size_hint()) |push| {
         for self.each |a| {
-            push(op(*a));
+            push(op(a));
         }
     }
 }
 
-pub pure fn flat_map_to_vec<A:Copy,B:Copy,IA:BaseIter<A>,IB:BaseIter<B>>(
-    self: &IA, op: fn(a: A) -> IB) -> ~[B] {
+pub pure fn flat_map_to_vec<A,B,IA:BaseIter<A>,IB:BaseIter<B>>(
+    self: &IA, op: fn(&A) -> IB) -> ~[B] {
     do vec::build |push| {
         for self.each |a| {
-            for op(*a).each |b| {
-                push(*b);
+            for op(a).each |&b| {
+                push(b);
             }
         }
     }
@@ -222,9 +223,9 @@ pub pure fn max<A:Copy Ord,IA:BaseIter<A>>(self: &IA) -> A {
 }
 
 pub pure fn find<A: Copy,IA:BaseIter<A>>(self: &IA,
-                                     p: fn(a: A) -> bool) -> Option<A> {
+                                   f: fn(&A) -> bool) -> Option<A> {
     for self.each |i| {
-        if p(*i) { return Some(*i) }
+        if f(i) { return Some(*i) }
     }
     return None;
 }
@@ -242,7 +243,7 @@ pub pure fn find<A: Copy,IA:BaseIter<A>>(self: &IA,
  *             onto the sequence being constructed.
  */
 #[inline(always)]
-pub pure fn build<A,B: Buildable<A>>(builder: fn(push: pure fn(v: A)))
+pub pure fn build<A,B: Buildable<A>>(builder: fn(push: pure fn(A)))
     -> B {
     Buildable::build_sized(4, builder)
 }
@@ -263,7 +264,7 @@ pub pure fn build<A,B: Buildable<A>>(builder: fn(push: pure fn(v: A)))
 #[inline(always)]
 pub pure fn build_sized_opt<A,B: Buildable<A>>(
     size: Option<uint>,
-    builder: fn(push: pure fn(v: A))) -> B {
+    builder: fn(push: pure fn(A))) -> B {
 
     Buildable::build_sized(size.get_default(4), builder)
 }

src/libcore/uint-template.rs

@@ -92,8 +92,8 @@ impl T: iter::Times {
         will execute the given function exactly x times. If we assume that \
         `x` is an int, this is functionally equivalent to \
         `for int::range(0, x) |_i| { /* anything */ }`."]
-    pure fn times(it: fn() -> bool) {
-        let mut i = self;
+    pure fn times(&self, it: fn() -> bool) {
+        let mut i = *self;
         while i > 0 {
             if !it() { break }
             i -= 1;

src/libcore/vec.rs

@@ -2013,57 +2013,60 @@ pub mod bytes {
 // required in the slice.
 
 impl<A> &[A]: iter::BaseIter<A> {
-    pub pure fn each(blk: fn(v: &A) -> bool) {
+    pub pure fn each(&self, blk: fn(v: &A) -> bool) {
         // FIXME(#2263)---should be able to call each(self, blk)
-        for each(self) |e| {
+        for each(*self) |e| {
             if (!blk(e)) {
                 return;
             }
         }
     }
-    pure fn size_hint() -> Option<uint> { Some(len(self)) }
+    pure fn size_hint(&self) -> Option<uint> { Some(len(*self)) }
 }
 
 impl<A> &[A]: iter::ExtendedIter<A> {
-    pub pure fn eachi(blk: fn(uint, v: &A) -> bool) {
-        iter::eachi(&self, blk)
+    pub pure fn eachi(&self, blk: fn(uint, v: &A) -> bool) {
+        iter::eachi(self, blk)
     }
-    pub pure fn all(blk: fn(&A) -> bool) -> bool { iter::all(&self, blk) }
-    pub pure fn any(blk: fn(&A) -> bool) -> bool { iter::any(&self, blk) }
-    pub pure fn foldl<B>(b0: B, blk: fn(&B, &A) -> B) -> B {
-        iter::foldl(&self, b0, blk)
+    pub pure fn all(&self, blk: fn(&A) -> bool) -> bool {
+        iter::all(self, blk)
     }
-    pub pure fn position(f: fn(&A) -> bool) -> Option<uint> {
-        iter::position(&self, f)
+    pub pure fn any(&self, blk: fn(&A) -> bool) -> bool {
+        iter::any(self, blk)
+    }
+    pub pure fn foldl<B>(&self, b0: B, blk: fn(&B, &A) -> B) -> B {
+        iter::foldl(self, b0, blk)
+    }
+    pub pure fn position(&self, f: fn(&A) -> bool) -> Option<uint> {
+        iter::position(self, f)
+    }
+    pure fn map_to_vec<B>(&self, op: fn(&A) -> B) -> ~[B] {
+        iter::map_to_vec(self, op)
+    }
+    pure fn flat_map_to_vec<B,IB:BaseIter<B>>(&self, op: fn(&A) -> IB)
+        -> ~[B] {
+        iter::flat_map_to_vec(self, op)
     }
 }
 
 impl<A: Eq> &[A]: iter::EqIter<A> {
-    pub pure fn contains(x: &A) -> bool { iter::contains(&self, x) }
-    pub pure fn count(x: &A) -> uint { iter::count(&self, x) }
+    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> &[A]: iter::CopyableIter<A> {
-    pure fn filter_to_vec(pred: fn(a: A) -> bool) -> ~[A] {
-        iter::filter_to_vec(&self, pred)
+    pure fn filter_to_vec(&self, pred: fn(&A) -> bool) -> ~[A] {
+        iter::filter_to_vec(self, pred)
     }
-    pure fn map_to_vec<B>(op: fn(v: A) -> B) -> ~[B] {
-        iter::map_to_vec(&self, op)
-    }
-    pure fn to_vec() -> ~[A] { iter::to_vec(&self) }
-
-    pure fn flat_map_to_vec<B:Copy,IB:BaseIter<B>>(op: fn(A) -> IB) -> ~[B] {
-        iter::flat_map_to_vec(&self, op)
-    }
-
-    pub pure fn find(p: fn(a: A) -> bool) -> Option<A> {
-        iter::find(&self, p)
+    pure fn to_vec(&self) -> ~[A] { iter::to_vec(self) }
+    pub pure fn find(&self, f: fn(&A) -> bool) -> Option<A> {
+        iter::find(self, f)
     }
 }
 
 impl<A: Copy Ord> &[A]: iter::CopyableOrderedIter<A> {
-    pure fn min() -> A { iter::min(&self) }
-    pure fn max() -> A { iter::max(&self) }
+    pure fn min(&self) -> A { iter::min(self) }
+    pure fn max(&self) -> A { iter::max(self) }
 }
 
 impl<A:Copy> &[A] : iter::CopyableNonstrictIter<A> {

src/librustc/metadata/creader.rs

@@ -70,7 +70,7 @@ fn warn_if_multiple_versions(e: env, diag: span_handler,
     if crate_cache.len() != 0u {
         let name = loader::crate_name_from_metas(*crate_cache.last().metas);
         let (matches, non_matches) =
-            partition(crate_cache.map_to_vec(|entry| {
+            partition(crate_cache.map_to_vec(|&entry| {
                 let othername = loader::crate_name_from_metas(*entry.metas);
                 if name == othername {
                     Left(entry)

src/librustc/middle/typeck/check/method.rs

@@ -861,7 +861,7 @@ impl LookupContext {
         -> Option<method_map_entry>
     {
         let relevant_candidates =
-            candidates.filter_to_vec(|c| self.is_relevant(self_ty, &c));
+            candidates.filter_to_vec(|c| self.is_relevant(self_ty, c));
 
         let relevant_candidates = self.merge_candidates(relevant_candidates);
 

src/librustdoc/attr_parser.rs

@@ -115,7 +115,7 @@ fn parse_desc_should_parse_simple_doc_attributes() {
 
 pub fn parse_hidden(+attrs: ~[ast::attribute]) -> bool {
     do doc_metas(attrs).find |meta| {
-        match attr::get_meta_item_list(meta) {
+        match attr::get_meta_item_list(*meta) {
           Some(metas) => {
             let hiddens = attr::find_meta_items_by_name(metas, ~"hidden");
             vec::is_not_empty(hiddens)

src/libsyntax/ext/pipes/proto.rs

@@ -218,8 +218,8 @@ fn visit<Tproto, Tstate, Tmessage, V: visitor<Tproto, Tstate, Tmessage>>(
     proto: protocol, visitor: V) -> Tproto {
 
     // the copy keywords prevent recursive use of dvec
-    let states = do (copy proto.states).map_to_vec |s| {
-        let messages = do (copy s.messages).map_to_vec |m| {
+    let states = do (copy proto.states).map_to_vec |&s| {
+        let messages = do (copy s.messages).map_to_vec |&m| {
             let message(name, span, tys, this, next) = m;
             visitor.visit_message(name, span, tys, this, next)
         };

src/test/compile-fail/alt-vec-illegal-tail-element-loan.rs

@@ -1,7 +1,7 @@
 fn a() -> &int {
     let vec = [1, 2, 3, 4];
     let tail = match vec {
-        [a, ..tail] => &tail[0], //~ ERROR illegal borrow
+        [_a, ..tail] => &tail[0], //~ ERROR illegal borrow
         _ => fail ~"foo"
     };
     move tail

src/test/compile-fail/alt-vec-illegal-tail-loan.rs

@@ -1,7 +1,7 @@
 fn a() -> &[int] {
     let vec = [1, 2, 3, 4];
     let tail = match vec {
-        [a, ..tail] => tail, //~ ERROR illegal borrow
+        [_a, ..tail] => tail, //~ ERROR illegal borrow
         _ => fail ~"foo"
     };
     move tail