libstd: Fix a bunch of resolve errors in tests. rs=fire

src/libstd/smallintmap.rs

@@ -19,8 +19,8 @@ use map::Map;
 
 use core::dvec::DVec;
 use core::ops;
-use core::option;
 use core::option::{Some, None};
+use core::option;
 
 // FIXME (#2347): Should not be @; there's a bug somewhere in rustc that
 // requires this to be.
@@ -168,6 +168,8 @@ pub fn as_map<V: Copy>(s: SmallIntMap<V>) -> map::Map<uint, V> {
 
 #[cfg(test)]
 mod tests {
+    use core::option::None;
+    use core::option;
 
     #[test]
     fn test_insert_with_key() {