Correct merge failures

3 files changed, 4 insertions, 4 deletions

diff --git a/src/libextra/fileinput.rs b/src/libextra/fileinput.rs
index de6edd54094..27c8051afac 100644
--- a/src/libextra/fileinput.rs
+++ b/src/libextra/fileinput.rs
@@ -418,7 +418,7 @@ mod test {
     fn make_file(path : &Path, contents: &[~str]) {
         let file = io::file_writer(path, [io::Create, io::Truncate]).get();
 
-        for contents.iter().advance |&str| {
+        for contents.iter().advance |str| {
             file.write_str(*str);
             file.write_char('\n');
         }
diff --git a/src/libextra/num/bigint.rs b/src/libextra/num/bigint.rs
index 91842474899..5867b13f556 100644
--- a/src/libextra/num/bigint.rs
+++ b/src/libextra/num/bigint.rs
@@ -1586,7 +1586,7 @@ mod biguint_tests {
             let &(ref n, ref rs) = num_pair;
             for rs.iter().advance |str_pair| {
                 let &(ref radix, ref str) = str_pair;
-                assert_eq!(&n, &FromStrRadix::from_str_radix(*str, *radix).get());
+                assert_eq!(n, &FromStrRadix::from_str_radix(*str, *radix).get());
             }
         }
 
diff --git a/src/libextra/term.rs b/src/libextra/term.rs
index 55626622775..cd226e2ad32 100644
--- a/src/libextra/term.rs
+++ b/src/libextra/term.rs
@@ -119,8 +119,8 @@ impl Terminal {
     pub fn reset(&self) {
         let mut vars = Variables::new();
         let s = do self.ti.strings.find_equiv(&("op"))
-                       .map_consume_default(Err(~"can't find terminfo capability `op`")) |&op| {
-                           expand(op, [], &mut vars)
+                       .map_consume_default(Err(~"can't find terminfo capability `op`")) |op| {
+                           expand(copy *op, [], &mut vars)
                        };
         if s.is_ok() {
             self.out.write(s.unwrap());