Skip to content

Commit 1962803

Browse files
committed
core: Warning police
1 parent 34f7255 commit 1962803

File tree

9 files changed

+5
-12
lines changed

9 files changed

+5
-12
lines changed

src/libcore/condition.rs

+2
Original file line numberDiff line numberDiff line change
@@ -206,10 +206,12 @@ mod test {
206206
fn test_conditions_are_public() {
207207
let mut trapped = false;
208208
do sadness::cond.trap(|_| {
209+
trapped = true;
209210
0
210211
}).in {
211212
sadness::cond.raise(0);
212213
}
214+
assert!(trapped);
213215
}
214216
}
215217
}

src/libcore/rt/io/file.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
use prelude::*;
1212
use super::support::PathLike;
1313
use super::{Reader, Writer, Seek, Close};
14-
use super::{IoError, SeekStyle};
14+
use super::SeekStyle;
1515

1616
/// # XXX
1717
/// * Ugh, this is ridiculous. What is the best way to represent these options?

src/libcore/rt/io/net/tcp.rs

-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
// except according to those terms.
1010

1111
use prelude::*;
12-
use super::*;
1312
use super::super::*;
1413
use super::ip::IpAddr;
1514

@@ -51,8 +50,6 @@ impl Listener<TcpStream> for TcpListener {
5150

5251
#[cfg(test)]
5352
mod test {
54-
use super::*;
55-
use rt::test::*;
5653

5754
#[test] #[ignore]
5855
fn smoke_test() {

src/libcore/rt/io/net/udp.rs

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
// except according to those terms.
1010

1111
use prelude::*;
12-
use super::*;
1312
use super::super::*;
1413
use super::ip::IpAddr;
1514

src/libcore/rt/io/net/unix.rs

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
// except according to those terms.
1010

1111
use prelude::*;
12-
use super::*;
1312
use super::super::*;
1413
use super::super::support::PathLike;
1514

src/libcore/rt/local_services.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
use prelude::*;
2222
use libc::{c_void, uintptr_t};
2323
use cast::transmute;
24-
use super::sched::{Task, local_sched};
24+
use super::sched::local_sched;
2525
use super::local_heap::LocalHeap;
2626

2727
pub struct LocalServices {

src/libcore/rt/test.rs

-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ pub fn run_in_newsched_task(f: ~fn()) {
3535

3636
/// Test tasks will abort on failure instead of unwinding
3737
pub fn spawntask(f: ~fn()) {
38-
use super::*;
3938
use super::sched::*;
4039

4140
let mut sched = local_sched::take();
@@ -51,7 +50,6 @@ pub fn spawntask(f: ~fn()) {
5150

5251
/// Create a new task and run it right now. Aborts on failure
5352
pub fn spawntask_immediately(f: ~fn()) {
54-
use super::*;
5553
use super::sched::*;
5654

5755
let mut sched = local_sched::take();

src/libcore/rt/uvio.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
use option::*;
1212
use result::*;
1313

14-
use super::io::net::ip::{IpAddr, Ipv4}; // n.b. Ipv4 is used only in tests
14+
use super::io::net::ip::IpAddr;
1515
use super::uv::*;
1616
use super::rtio::*;
1717
use ops::Drop;
@@ -21,7 +21,6 @@ use super::sched::{Scheduler, local_sched};
2121

2222
#[cfg(test)] use uint;
2323
#[cfg(test)] use unstable::run_in_bare_thread;
24-
#[cfg(test)] use super::sched::Task;
2524
#[cfg(test)] use super::test::*;
2625

2726
pub struct UvEventLoop {

src/libcore/task/local_data.rs

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ magic.
2828

2929
use prelude::*;
3030
use task::local_data_priv::{local_get, local_pop, local_modify, local_set, Handle};
31-
use task::rt;
3231

3332
/**
3433
* Indexes a task-local data slot. The function's code pointer is used for

0 commit comments

Comments
 (0)