From f6a27cbda273d5d39af953bca12990cc4930382c Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Wed, 26 Jun 2013 15:54:51 -0700
Subject: [PATCH] libextra: Fix even more merge fallout.

---
 src/libextra/ebml.rs       | 3 ++-
 src/libextra/num/bigint.rs | 2 --
 src/libextra/test.rs       | 3 ---
 src/libextra/timer.rs      | 1 -
 src/libstd/task/spawn.rs   | 1 -
 5 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/libextra/ebml.rs b/src/libextra/ebml.rs
index fad04b772eb7..d401710a466d 100644
--- a/src/libextra/ebml.rs
+++ b/src/libextra/ebml.rs
@@ -94,7 +94,6 @@ pub mod reader {
 
     use serialize;
 
-    use core::prelude::*;
     use core::cast::transmute;
     use core::int;
     use core::io;
@@ -106,6 +105,8 @@ pub mod reader {
 
     #[cfg(target_arch = "x86")]
     #[cfg(target_arch = "x86_64")]
+    use core::option::{None, Option, Some};
+    use core::ptr::offset;
     use core::unstable::intrinsics::bswap32;
 
     // ebml reading
diff --git a/src/libextra/num/bigint.rs b/src/libextra/num/bigint.rs
index b0fa715fdd81..002d8a7f9567 100644
--- a/src/libextra/num/bigint.rs
+++ b/src/libextra/num/bigint.rs
@@ -382,8 +382,6 @@ impl Integer for BigUint {
             while m >= b {
                 let (d0, d_unit, b_unit) = div_estimate(&m, &b, n);
                 let mut d0 = d0;
-                let mut d_unit = d_unit;
-                let mut b_unit = b_unit;
                 let mut prod = b * d0;
                 while prod > m {
                     // FIXME(#6050): overloaded operators force moves with generic types
diff --git a/src/libextra/test.rs b/src/libextra/test.rs
index 672c4cd648cf..209b46809ce3 100644
--- a/src/libextra/test.rs
+++ b/src/libextra/test.rs
@@ -751,9 +751,6 @@ impl BenchHarness {
 }
 
 pub mod bench {
-    use core::prelude::*;
-
-    use core::vec;
     use test::{BenchHarness, BenchSamples};
 
     pub fn benchmark(f: &fn(&mut BenchHarness)) -> BenchSamples {
diff --git a/src/libextra/timer.rs b/src/libextra/timer.rs
index 79451db8b171..e23f9113319d 100644
--- a/src/libextra/timer.rs
+++ b/src/libextra/timer.rs
@@ -125,7 +125,6 @@ pub fn recv_timeout<T:Copy + Send>(iotask: &IoTask,
                                    -> Option<T> {
     let (timeout_po, timeout_ch) = stream::<()>();
     let mut timeout_po = timeout_po;
-    let mut timeout_ch = timeout_ch;
     delayed_send(iotask, msecs, &timeout_ch, ());
 
     // XXX: Workaround due to ports and channels not being &mut. They should
diff --git a/src/libstd/task/spawn.rs b/src/libstd/task/spawn.rs
index da3dc6b2a2e5..8f06fede0572 100644
--- a/src/libstd/task/spawn.rs
+++ b/src/libstd/task/spawn.rs
@@ -637,7 +637,6 @@ fn spawn_raw_oldsched(mut opts: TaskOpts, f: ~fn()) {
         let result: ~fn() = || {
             // Agh. Get move-mode items into the closure. FIXME (#2829)
             let (notify_chan, child_arc, ancestors) = child_data.take();
-            let mut child_arc = child_arc;
             let mut ancestors = ancestors;
             // Child task runs this code.