diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2013-06-26 15:54:51 -0700 |
|---|---|---|
| committer | Corey Richardson <corey@octayn.net> | 2013-06-28 10:47:56 -0400 |
| commit | f6a27cbda273d5d39af953bca12990cc4930382c (patch) | |
| tree | de84234349180c768e96fc1a5c905c1d8a645250 | |
| parent | 3625781cfe20db713158236f5d03e0c249f5137f (diff) | |
| download | rust-f6a27cbda273d5d39af953bca12990cc4930382c.tar.gz rust-f6a27cbda273d5d39af953bca12990cc4930382c.zip | |
libextra: Fix even more merge fallout.
| -rw-r--r-- | src/libextra/ebml.rs | 3 | ||||
| -rw-r--r-- | src/libextra/num/bigint.rs | 2 | ||||
| -rw-r--r-- | src/libextra/test.rs | 3 | ||||
| -rw-r--r-- | src/libextra/timer.rs | 1 | ||||
| -rw-r--r-- | 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 fad04b772eb..d401710a466 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 b0fa715fdd8..002d8a7f956 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 672c4cd648c..209b46809ce 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 79451db8b17..e23f9113319 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 da3dc6b2a2e..8f06fede057 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. |