Skip to content

Commit dc0a883

Browse files
committed
---
yaml --- r: 142591 b: refs/heads/try2 c: ea633b4 h: refs/heads/master i: 142589: fbdfa4a 142587: 83f8cc1 142583: 7c6ab14 142575: 9208e89 142559: 6d3e854 142527: 1be3feb 142463: 6ef3bda 142335: 0344d92 v: v3
1 parent 95c4bce commit dc0a883

File tree

8 files changed

+12
-23
lines changed

8 files changed

+12
-23
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 053b38e7e1cba8f7bb649a5fc8d82b0448d33c55
8+
refs/heads/try2: ea633b42aeadf807a10036a87bf2903123250152
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libstd/rt/comm.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ use ops::Drop;
2222
use kinds::Owned;
2323
use rt::sched::{Scheduler, Coroutine};
2424
use rt::local::Local;
25-
use rt::rtio::EventLoop;
2625
use unstable::intrinsics::{atomic_xchg, atomic_load};
2726
use util::Void;
2827
use comm::{GenericChan, GenericSmartChan, GenericPort, Peekable};

branches/try2/src/libstd/rt/local.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ impl Local for IoFactoryObject {
8787
mod test {
8888
use rt::test::*;
8989
use rt::sched::Scheduler;
90-
use rt::uv::uvio::UvEventLoop;
9190
use super::*;
9291

9392
#[test]

branches/try2/src/libstd/rt/mod.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ Several modules in `core` are clients of `rt`:
5555
*/
5656

5757
#[doc(hidden)];
58+
#[deny(unused_imports)];
59+
#[deny(unused_mut)];
60+
#[deny(unused_variable)];
5861

5962
use ptr::Ptr;
6063

@@ -228,8 +231,6 @@ pub fn context() -> RuntimeContext {
228231
fn test_context() {
229232
use unstable::run_in_bare_thread;
230233
use self::sched::{Scheduler, Coroutine};
231-
use rt::uv::uvio::UvEventLoop;
232-
use cell::Cell;
233234
use rt::local::Local;
234235
use rt::test::new_test_uv_sched;
235236

branches/try2/src/libstd/rt/sched.rs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ use sys;
1313
use cast::transmute;
1414
use cell::Cell;
1515
use clone::Clone;
16-
use to_str::ToStr;
1716

1817
use super::sleeper_list::SleeperList;
1918
use super::work_queue::WorkQueue;
@@ -24,7 +23,7 @@ use super::task::Task;
2423
use super::message_queue::MessageQueue;
2524
use rt::local_ptr;
2625
use rt::local::Local;
27-
use rt::rtio::{IoFactoryObject, RemoteCallback};
26+
use rt::rtio::RemoteCallback;
2827
use rt::metrics::SchedMetrics;
2928

3029
/// The Scheduler is responsible for coordinating execution of Coroutines
@@ -583,7 +582,6 @@ impl ClosureConverter for UnsafeTaskReceiver {
583582
mod test {
584583
use int;
585584
use cell::Cell;
586-
use rt::uv::uvio::UvEventLoop;
587585
use unstable::run_in_bare_thread;
588586
use task::spawn;
589587
use rt::local::Local;
@@ -751,13 +749,13 @@ mod test {
751749

752750
let sched1_cell = Cell(sched1);
753751
let _thread1 = do Thread::start {
754-
let mut sched1 = sched1_cell.take();
752+
let sched1 = sched1_cell.take();
755753
sched1.run();
756754
};
757755

758756
let sched2_cell = Cell(sched2);
759757
let _thread2 = do Thread::start {
760-
let mut sched2 = sched2_cell.take();
758+
let sched2 = sched2_cell.take();
761759
sched2.run();
762760
};
763761
}
@@ -790,9 +788,6 @@ mod test {
790788
#[test]
791789
fn thread_ring() {
792790
use rt::comm::*;
793-
use iter::Times;
794-
use vec::OwnedVector;
795-
use container::Container;
796791
use comm::{GenericPort, GenericChan};
797792

798793
do run_in_mt_newsched_task {

branches/try2/src/libstd/rt/sleeper_list.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use vec::OwnedVector;
1616
use option::{Option, Some, None};
1717
use cell::Cell;
1818
use unstable::sync::{Exclusive, exclusive};
19-
use rt::sched::{Scheduler, SchedHandle};
19+
use rt::sched::SchedHandle;
2020
use clone::Clone;
2121

2222
pub struct SleeperList {

branches/try2/src/libstd/rt/test.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
use uint;
12-
use option::{Option, Some, None};
12+
use option::{Some, None};
1313
use cell::Cell;
1414
use clone::Clone;
1515
use container::Container;
@@ -42,7 +42,6 @@ pub fn new_test_uv_sched() -> Scheduler {
4242
pub fn run_in_newsched_task(f: ~fn()) {
4343
use super::sched::*;
4444
use unstable::run_in_bare_thread;
45-
use rt::uv::uvio::UvEventLoop;
4645

4746
let f = Cell(f);
4847

@@ -74,7 +73,7 @@ pub fn run_in_mt_newsched_task(f: ~fn()) {
7473
let mut handles = ~[];
7574
let mut scheds = ~[];
7675

77-
for uint::range(0, N) |i| {
76+
for uint::range(0, N) |_| {
7877
let loop_ = ~UvEventLoop::new();
7978
let mut sched = ~Scheduler::new(loop_, work_queue.clone(), sleepers.clone());
8079
let handle = sched.make_handle();
@@ -102,7 +101,7 @@ pub fn run_in_mt_newsched_task(f: ~fn()) {
102101
let sched = scheds.pop();
103102
let sched_cell = Cell(sched);
104103
let thread = do Thread::start {
105-
let mut sched = sched_cell.take();
104+
let sched = sched_cell.take();
106105
sched.run();
107106
};
108107

@@ -214,7 +213,6 @@ pub fn spawntask_try(f: ~fn()) -> Result<(), ()> {
214213
// Spawn a new task in a new scheduler and return a thread handle.
215214
pub fn spawntask_thread(f: ~fn()) -> Thread {
216215
use rt::sched::*;
217-
use rt::uv::uvio::UvEventLoop;
218216

219217
let f = Cell(f);
220218
let thread = do Thread::start {

branches/try2/src/libstd/rt/uv/uvio.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ use rt::sched::Scheduler;
2424
use rt::io::{standard_error, OtherIoError};
2525
use rt::tube::Tube;
2626
use rt::local::Local;
27-
use rt::work_queue::WorkQueue;
2827
use unstable::sync::{UnsafeAtomicRcBox, AtomicInt};
29-
use unstable::intrinsics;
3028

3129
#[cfg(test)] use container::Container;
3230
#[cfg(test)] use uint;
@@ -140,7 +138,7 @@ impl RemoteCallback for UvRemoteCallback {
140138
impl Drop for UvRemoteCallback {
141139
fn finalize(&self) {
142140
unsafe {
143-
let mut this: &mut UvRemoteCallback = cast::transmute_mut(self);
141+
let this: &mut UvRemoteCallback = cast::transmute_mut(self);
144142
let exit_flag_ptr = this.exit_flag.get();
145143
(*exit_flag_ptr).store(1);
146144
this.async.send();
@@ -150,7 +148,6 @@ impl Drop for UvRemoteCallback {
150148

151149
#[cfg(test)]
152150
mod test_remote {
153-
use super::*;
154151
use cell;
155152
use cell::Cell;
156153
use rt::test::*;

0 commit comments

Comments
 (0)