about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2014-12-21 00:12:56 -0800
committerAlex Crichton <alex@alexcrichton.com>2014-12-21 13:49:04 -0800
commitfb7c08876e7b29c1b9d57df905f3ee0deec46aa1 (patch)
tree2b7eb92a4d5a0d997871020964fe539390737dd3 /src/libstd
parentdbeef0edb2d25a3ff321d8e09532f053b5ef2c07 (diff)
downloadrust-fb7c08876e7b29c1b9d57df905f3ee0deec46aa1.tar.gz
rust-fb7c08876e7b29c1b9d57df905f3ee0deec46aa1.zip
Test fixes and rebase conflicts
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/collections/hash/map.rs1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libstd/collections/hash/map.rs b/src/libstd/collections/hash/map.rs
index c32fec67d66..8149864afd4 100644
--- a/src/libstd/collections/hash/map.rs
+++ b/src/libstd/collections/hash/map.rs
@@ -1473,7 +1473,6 @@ mod test_map {
 
     use super::HashMap;
     use super::Entry::{Occupied, Vacant};
-    use cmp::Equiv;
     use hash;
     use iter::{range_inclusive, range_step_inclusive};
     use cell::RefCell;