auto merge of #11333 : cmr/rust/triage2, r=alexcrichton

4 files changed, 11 insertions, 5 deletions

diff --git a/src/libstd/ascii.rs b/src/libstd/ascii.rs
index 974bc454c66..adc10c456e3 100644
--- a/src/libstd/ascii.rs
+++ b/src/libstd/ascii.rs
@@ -577,6 +577,7 @@ mod tests {
     #[test] #[should_fail]
     fn test_ascii_fail_char_slice() { 'λ'.to_ascii(); }
 
+    #[test]
     fn test_opt() {
         assert_eq!(65u8.to_ascii_opt(), Some(Ascii { chr: 65u8 }));
         assert_eq!(255u8.to_ascii_opt(), None);
diff --git a/src/libstd/io/net/udp.rs b/src/libstd/io/net/udp.rs
index b4f79b285b7..8994f6b461a 100644
--- a/src/libstd/io/net/udp.rs
+++ b/src/libstd/io/net/udp.rs
@@ -99,9 +99,8 @@ impl Writer for UdpStream {
 #[cfg(test)]
 mod test {
     use super::*;
-    use io::net::ip::{Ipv4Addr, SocketAddr};
+    use io::net::ip::{SocketAddr};
     use io::*;
-    use io::test::*;
     use prelude::*;
 
     iotest!(fn bind_error() {
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 1d24c2c66f8..492059ebb70 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -163,6 +163,7 @@ pub mod sync;
 
 /* Runtime and platform support */
 
+#[unstable]
 pub mod libc;
 pub mod c_str;
 pub mod os;
@@ -172,9 +173,8 @@ pub mod rand;
 pub mod run;
 pub mod cast;
 pub mod fmt;
-pub mod repr;
 pub mod cleanup;
-pub mod reflect;
+#[deprecated]
 pub mod condition;
 pub mod logging;
 pub mod util;
@@ -183,7 +183,13 @@ pub mod mem;
 
 /* Unsupported interfaces */
 
+#[unstable]
+pub mod repr;
+#[unstable]
+pub mod reflect;
+
 // Private APIs
+#[unstable]
 pub mod unstable;
 
 
@@ -195,6 +201,7 @@ mod cmath;
 
 // FIXME #7809: This shouldn't be pub, and it should be reexported under 'unstable'
 // but name resolution doesn't work without it being pub.
+#[unstable]
 pub mod rt;
 
 // A curious inner-module that's not exported that contains the binding
diff --git a/src/libstd/rt/local.rs b/src/libstd/rt/local.rs
index b4a6f06c2a4..37596b35015 100644
--- a/src/libstd/rt/local.rs
+++ b/src/libstd/rt/local.rs
@@ -54,7 +54,6 @@ mod test {
     use unstable::run_in_bare_thread;
     use super::*;
     use rt::task::Task;
-    use rt::local_ptr;
 
     #[test]
     fn thread_local_task_smoke_test() {