diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-05-07 08:20:22 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-05-07 11:03:12 -0700 |
| commit | 07caa224501817c93be3f5c57a013ed5db6c04e1 (patch) | |
| tree | 4a7df32c0c34f78282e842b308c2751f3d3cd5ee /src/libstd/sync | |
| parent | a289ebefb8c3584d91484f0bb62f696dffadda02 (diff) | |
| download | rust-07caa224501817c93be3f5c57a013ed5db6c04e1.tar.gz rust-07caa224501817c93be3f5c57a013ed5db6c04e1.zip | |
Test fixes and rebase conflicts
Diffstat (limited to 'src/libstd/sync')
| -rw-r--r-- | src/libstd/sync/mpmc_bounded_queue.rs | 1 |
1 files changed, 0 insertions, 1 deletions
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; |