From 07caa224501817c93be3f5c57a013ed5db6c04e1 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Wed, 7 May 2014 08:20:22 -0700
Subject: Test fixes and rebase conflicts

---
 src/libstd/sync/mpmc_bounded_queue.rs | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/libstd/sync')

diff --git a/src/libstd/sync/mpmc_bounded_queue.rs b/src/libstd/sync/mpmc_bounded_queue.rs
index b392cc8ff9a..2df5031b482 100644
--- a/src/libstd/sync/mpmc_bounded_queue.rs
+++ b/src/libstd/sync/mpmc_bounded_queue.rs
@@ -162,7 +162,6 @@ impl<T: Send> Clone for Queue<T> {
 #[cfg(test)]
 mod tests {
     use prelude::*;
-    use option::*;
     use super::Queue;
     use native;
 
-- 
cgit 1.4.1-3-g733a5