---

yaml
---
r: 179318
b: refs/heads/tmp
c: f7aac93
h: refs/heads/master
v: v3

Author: Manishearth

[refs]

@@ -34,4 +34,4 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
 refs/heads/beta: 44a287e6eb22ec3c2a687fc156813577464017f7
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: 73b9aeb4295aaf6c215c5981150bfa2ac9ace60a
+refs/heads/tmp: f7aac937f588f43c9124639be5c20366921b49be

branches/tmp/src/libcollections/btree/map.rs

@@ -1592,7 +1592,8 @@ mod test {
     use prelude::*;
     use std::iter::range_inclusive;
 
-    use super::{BTreeMap, Occupied, Vacant};
+    use super::BTreeMap;
+    use super::Entry::{Occupied, Vacant};
     use Bound::{self, Included, Excluded, Unbounded};
 
     #[test]

branches/tmp/src/libcollections/vec_map.rs

@@ -915,7 +915,8 @@ mod test_map {
     use prelude::*;
     use core::hash::{hash, SipHasher};
 
-    use super::{VecMap, Occupied, Vacant};
+    use super::VecMap;
+    use super::Entry::{Occupied, Vacant};
 
     #[test]
     fn test_get_mut() {