about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2013-04-24 12:11:33 -0700
committerBrian Anderson <banderson@mozilla.com>2013-04-24 13:47:52 -0700
commit1962803854bcf7245013f8a1377c0ade845b5c54 (patch)
treef77abee271c3efa9e773d349bc97449d51724c6c
parent34f7255afa4aa80ade1f98b99f0f54cb424b129e (diff)
downloadrust-1962803854bcf7245013f8a1377c0ade845b5c54.tar.gz
rust-1962803854bcf7245013f8a1377c0ade845b5c54.zip
core: Warning police
-rw-r--r--src/libcore/condition.rs2
-rw-r--r--src/libcore/rt/io/file.rs2
-rw-r--r--src/libcore/rt/io/net/tcp.rs3
-rw-r--r--src/libcore/rt/io/net/udp.rs1
-rw-r--r--src/libcore/rt/io/net/unix.rs1
-rw-r--r--src/libcore/rt/local_services.rs2
-rw-r--r--src/libcore/rt/test.rs2
-rw-r--r--src/libcore/rt/uvio.rs3
-rw-r--r--src/libcore/task/local_data.rs1
9 files changed, 5 insertions, 12 deletions
diff --git a/src/libcore/condition.rs b/src/libcore/condition.rs
index c639239981c..1240fe03dd5 100644
--- a/src/libcore/condition.rs
+++ b/src/libcore/condition.rs
@@ -206,10 +206,12 @@ mod test {
             fn test_conditions_are_public() {
                 let mut trapped = false;
                 do sadness::cond.trap(|_| {
+                    trapped = true;
                     0
                 }).in {
                     sadness::cond.raise(0);
                 }
+                assert!(trapped);
             }
         }
     }
diff --git a/src/libcore/rt/io/file.rs b/src/libcore/rt/io/file.rs
index e4fe066a173..85dc180452f 100644
--- a/src/libcore/rt/io/file.rs
+++ b/src/libcore/rt/io/file.rs
@@ -11,7 +11,7 @@
 use prelude::*;
 use super::support::PathLike;
 use super::{Reader, Writer, Seek, Close};
-use super::{IoError, SeekStyle};
+use super::SeekStyle;
 
 /// # XXX
 /// * Ugh, this is ridiculous. What is the best way to represent these options?
diff --git a/src/libcore/rt/io/net/tcp.rs b/src/libcore/rt/io/net/tcp.rs
index d726bae821c..c95b4344fe7 100644
--- a/src/libcore/rt/io/net/tcp.rs
+++ b/src/libcore/rt/io/net/tcp.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 use prelude::*;
-use super::*;
 use super::super::*;
 use super::ip::IpAddr;
 
@@ -51,8 +50,6 @@ impl Listener<TcpStream> for TcpListener {
 
 #[cfg(test)]
 mod test {
-    use super::*;
-    use rt::test::*;
 
     #[test] #[ignore]
     fn smoke_test() {
diff --git a/src/libcore/rt/io/net/udp.rs b/src/libcore/rt/io/net/udp.rs
index 8691a697e88..0cb2978fb1a 100644
--- a/src/libcore/rt/io/net/udp.rs
+++ b/src/libcore/rt/io/net/udp.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 use prelude::*;
-use super::*;
 use super::super::*;
 use super::ip::IpAddr;
 
diff --git a/src/libcore/rt/io/net/unix.rs b/src/libcore/rt/io/net/unix.rs
index bb3db6ec0d5..262816beecc 100644
--- a/src/libcore/rt/io/net/unix.rs
+++ b/src/libcore/rt/io/net/unix.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 use prelude::*;
-use super::*;
 use super::super::*;
 use super::super::support::PathLike;
 
diff --git a/src/libcore/rt/local_services.rs b/src/libcore/rt/local_services.rs
index 8a6277c2094..a03bc6c409f 100644
--- a/src/libcore/rt/local_services.rs
+++ b/src/libcore/rt/local_services.rs
@@ -21,7 +21,7 @@
 use prelude::*;
 use libc::{c_void, uintptr_t};
 use cast::transmute;
-use super::sched::{Task, local_sched};
+use super::sched::local_sched;
 use super::local_heap::LocalHeap;
 
 pub struct LocalServices {
diff --git a/src/libcore/rt/test.rs b/src/libcore/rt/test.rs
index f7ba881f84e..63db7054088 100644
--- a/src/libcore/rt/test.rs
+++ b/src/libcore/rt/test.rs
@@ -35,7 +35,6 @@ pub fn run_in_newsched_task(f: ~fn()) {
 
 /// Test tasks will abort on failure instead of unwinding
 pub fn spawntask(f: ~fn()) {
-    use super::*;
     use super::sched::*;
 
     let mut sched = local_sched::take();
@@ -51,7 +50,6 @@ pub fn spawntask(f: ~fn()) {
 
 /// Create a new task and run it right now. Aborts on failure
 pub fn spawntask_immediately(f: ~fn()) {
-    use super::*;
     use super::sched::*;
 
     let mut sched = local_sched::take();
diff --git a/src/libcore/rt/uvio.rs b/src/libcore/rt/uvio.rs
index 984ae55399c..94f8c0bf707 100644
--- a/src/libcore/rt/uvio.rs
+++ b/src/libcore/rt/uvio.rs
@@ -11,7 +11,7 @@
 use option::*;
 use result::*;
 
-use super::io::net::ip::{IpAddr, Ipv4}; // n.b. Ipv4 is used only in tests
+use super::io::net::ip::IpAddr;
 use super::uv::*;
 use super::rtio::*;
 use ops::Drop;
@@ -21,7 +21,6 @@ use super::sched::{Scheduler, local_sched};
 
 #[cfg(test)] use uint;
 #[cfg(test)] use unstable::run_in_bare_thread;
-#[cfg(test)] use super::sched::Task;
 #[cfg(test)] use super::test::*;
 
 pub struct UvEventLoop {
diff --git a/src/libcore/task/local_data.rs b/src/libcore/task/local_data.rs
index 65e68931915..dff5908c047 100644
--- a/src/libcore/task/local_data.rs
+++ b/src/libcore/task/local_data.rs
@@ -28,7 +28,6 @@ magic.
 
 use prelude::*;
 use task::local_data_priv::{local_get, local_pop, local_modify, local_set, Handle};
-use task::rt;
 
 /**
  * Indexes a task-local data slot. The function's code pointer is used for