Skip to content

Commit e8c7767

Browse files
pcwaltonemberian
authored andcommitted
---
yaml --- r: 68453 b: refs/heads/auto c: f6a27cb h: refs/heads/master i: 68451: eef8cc8 v: v3
1 parent dd4484c commit e8c7767

File tree

6 files changed

+3
-9
lines changed

6 files changed

+3
-9
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: 3625781cfe20db713158236f5d03e0c249f5137f
17+
refs/heads/auto: f6a27cbda273d5d39af953bca12990cc4930382c
1818
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1919
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/libextra/ebml.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ pub mod reader {
9494

9595
use serialize;
9696

97-
use core::prelude::*;
9897
use core::cast::transmute;
9998
use core::int;
10099
use core::io;
@@ -106,6 +105,8 @@ pub mod reader {
106105

107106
#[cfg(target_arch = "x86")]
108107
#[cfg(target_arch = "x86_64")]
108+
use core::option::{None, Option, Some};
109+
use core::ptr::offset;
109110
use core::unstable::intrinsics::bswap32;
110111

111112
// ebml reading

branches/auto/src/libextra/num/bigint.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,8 +382,6 @@ impl Integer for BigUint {
382382
while m >= b {
383383
let (d0, d_unit, b_unit) = div_estimate(&m, &b, n);
384384
let mut d0 = d0;
385-
let mut d_unit = d_unit;
386-
let mut b_unit = b_unit;
387385
let mut prod = b * d0;
388386
while prod > m {
389387
// FIXME(#6050): overloaded operators force moves with generic types

branches/auto/src/libextra/test.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -751,9 +751,6 @@ impl BenchHarness {
751751
}
752752
753753
pub mod bench {
754-
use core::prelude::*;
755-
756-
use core::vec;
757754
use test::{BenchHarness, BenchSamples};
758755
759756
pub fn benchmark(f: &fn(&mut BenchHarness)) -> BenchSamples {

branches/auto/src/libextra/timer.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ pub fn recv_timeout<T:Copy + Send>(iotask: &IoTask,
125125
-> Option<T> {
126126
let (timeout_po, timeout_ch) = stream::<()>();
127127
let mut timeout_po = timeout_po;
128-
let mut timeout_ch = timeout_ch;
129128
delayed_send(iotask, msecs, &timeout_ch, ());
130129

131130
// XXX: Workaround due to ports and channels not being &mut. They should

branches/auto/src/libstd/task/spawn.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,6 @@ fn spawn_raw_oldsched(mut opts: TaskOpts, f: ~fn()) {
637637
let result: ~fn() = || {
638638
// Agh. Get move-mode items into the closure. FIXME (#2829)
639639
let (notify_chan, child_arc, ancestors) = child_data.take();
640-
let mut child_arc = child_arc;
641640
let mut ancestors = ancestors;
642641
// Child task runs this code.
643642

0 commit comments

Comments
 (0)