4 files changed, 3 insertions, 4 deletions
diff --git a/src/libstd/ebml.rs b/src/libstd/ebml.rs
index 9b89036eee5..65ce9d8989f 100644
--- a/src/libstd/ebml.rs
+++ b/src/libstd/ebml.rs
@@ -617,7 +617,7 @@ pub mod writer {
     priv impl Encoder {
         // used internally to emit things like the vector length and so on
         fn _emit_tagged_uint(&self, t: EbmlEncoderTag, v: uint) {
-            assert!(v <= 0xFFFF_FFFF_u);
+            assert!(v <= 0xFFFF_FFFF_u); // FIXME(#6130) assert warns on 32-bit
             self.wr_tagged_u32(t as uint, v as u32);
         }
 
diff --git a/src/libstd/future.rs b/src/libstd/future.rs
index c3fc16bdf70..5e3e64b2f1c 100644
--- a/src/libstd/future.rs
+++ b/src/libstd/future.rs
@@ -23,7 +23,7 @@
 
 use core::cast;
 use core::cell::Cell;
-use core::comm::{ChanOne, PortOne, oneshot, send_one};
+use core::comm::{PortOne, oneshot, send_one};
 use core::pipes::recv;
 use core::task;
 
diff --git a/src/libstd/sort.rs b/src/libstd/sort.rs
index c153d7f22c0..f3d30ecd5cd 100644
--- a/src/libstd/sort.rs
+++ b/src/libstd/sort.rs
@@ -11,7 +11,6 @@
 //! Sorting methods
 
 use core::cmp::{Eq, Ord};
-use core::util;
 use core::vec::len;
 use core::vec;
 
diff --git a/src/libstd/workcache.rs b/src/libstd/workcache.rs
index bb4a9e97ea1..c01d1f5a2d7 100644
--- a/src/libstd/workcache.rs
+++ b/src/libstd/workcache.rs
@@ -17,7 +17,7 @@ use sort;
 
 use core::cell::Cell;
 use core::cmp;
-use core::comm::{ChanOne, PortOne, oneshot, send_one};
+use core::comm::{PortOne, oneshot, send_one};
 use core::either::{Either, Left, Right};
 use core::hashmap::HashMap;
 use core::io;