Merge branch 'enum-method-privacy' of https://github.com/michaelwoerister/rust into...

Conflicts:
	src/libsyntax/opt_vec.rs

diff --cc src/libsyntax/ext/base.rs
Simple merge

diff --cc src/libsyntax/opt_vec.rs
index 5d79532c8c5353617cdb42e325075b3859f9c3f9,a6f6b9d48e2b704f65929fe206231df06091f262..3a10206b513f8920d7adbc84a2310cb9f91b423c
--- 1/src/libsyntax/opt_vec.rs
--- 2/src/libsyntax/opt_vec.rs
+++ b/src/libsyntax/opt_vec.rs
@@@ -57,10 -57,10 +57,10 @@@ impl<T> OptVec<T> 
          }
      }
  
-     fn map_move<U>(self, op: &fn(T) -> U) -> OptVec<U> {
 -    pub fn map_consume<U>(self, op: &fn(T) -> U) -> OptVec<U> {
++    pub fn map_move<U>(self, op: &fn(T) -> U) -> OptVec<U> {
          match self {
              Empty => Empty,
 -            Vec(v) => Vec(v.consume_iter().transform(op).collect())
 +            Vec(v) => Vec(v.move_iter().map(op).collect())
          }
      }
  
@@@ -91,11 -91,11 +91,11 @@@
      }
  
      #[inline]
-     fn map_to_vec<B>(&self, op: &fn(&T) -> B) -> ~[B] {
+     pub fn map_to_vec<B>(&self, op: &fn(&T) -> B) -> ~[B] {
 -        self.iter().transform(op).collect()
 +        self.iter().map(op).collect()
      }
  
-     fn mapi_to_vec<B>(&self, op: &fn(uint, &T) -> B) -> ~[B] {
+     pub fn mapi_to_vec<B>(&self, op: &fn(uint, &T) -> B) -> ~[B] {
          let mut index = 0;
          self.map_to_vec(|a| {
              let i = index;