---

yaml
---
r: 49525
b: refs/heads/master
c: 2b83def
h: refs/heads/master
i:
  49523: 81f9214
v: v3

Author: apasel422

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 11ca2efce13eee1e273b29543a8756eb4f69f66f
+refs/heads/master: 2b83defa4a48303db642f38e2a9f24460756721d
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: f7a2371c176663d59062ec5158f39faecba45768
 refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea

trunk/src/libcore/core.rc

@@ -231,6 +231,7 @@ pub mod rt;
 // can be resolved within libcore.
 #[doc(hidden)]
 pub mod core {
+    pub use clone;
     pub use cmp;
     pub use condition;
     pub use option;

trunk/src/libcore/either.rs

@@ -17,7 +17,7 @@ use result;
 use vec;
 
 /// The either type
-#[deriving(Eq)]
+#[deriving(Clone, Eq)]
 pub enum Either<T, U> {
     Left(T),
     Right(U)

trunk/src/libcore/option.rs

@@ -52,7 +52,7 @@ use iter::{BaseIter, MutableIter};
 #[cfg(test)] use str;
 
 /// The option type
-#[deriving(Eq)]
+#[deriving(Clone, Eq)]
 pub enum Option<T> {
     None,
     Some(T),

trunk/src/libcore/path.rs

@@ -20,7 +20,7 @@ use option::{None, Option, Some};
 use str;
 use to_str::ToStr;
 
-#[deriving(Eq)]
+#[deriving(Clone, Eq)]
 pub struct WindowsPath {
     host: Option<~str>,
     device: Option<~str>,
@@ -32,7 +32,7 @@ pub fn WindowsPath(s: &str) -> WindowsPath {
     GenericPath::from_str(s)
 }
 
-#[deriving(Eq)]
+#[deriving(Clone, Eq)]
 pub struct PosixPath {
     is_absolute: bool,
     components: ~[~str],

trunk/src/libcore/result.rs

@@ -20,7 +20,7 @@ use option::{None, Option, Some};
 use vec;
 
 /// The result type
-#[deriving(Eq)]
+#[deriving(Clone, Eq)]
 pub enum Result<T, U> {
     /// Contains the successful result value
     Ok(T),

trunk/src/librustc/middle/resolve.rs

@@ -4741,8 +4741,8 @@ pub impl Resolver {
         let mut j = this.value_ribs.len();
         while j != 0 {
             j -= 1;
-            for this.value_ribs[j].bindings.each_key |&k| {
-                vec::push(&mut maybes, copy *this.session.str_of(k));
+            for this.value_ribs[j].bindings.each_entry |e| {
+                vec::push(&mut maybes, copy *this.session.str_of(e.key));
                 vec::push(&mut values, uint::max_value);
             }
         }