From fb7c08876e7b29c1b9d57df905f3ee0deec46aa1 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Sun, 21 Dec 2014 00:12:56 -0800
Subject: Test fixes and rebase conflicts

---
 src/libstd/collections/hash/map.rs | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/libstd')

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;
-- 
cgit 1.4.1-3-g733a5