servo: Merge #18385 - Clean imports in hashglobe (from Manishearth:clean-imports); r=mbrubeck

Source-Repo: https://github.com/servo/servo
Source-Revision: f29fd7757396e8763753215b8e7d82cb437f8f5a

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 993da1529e834001ab485e10a08444485bf445df

servo/components/hashglobe/src/hash_map.rs

@@ -11,14 +11,14 @@
 use self::Entry::*;
 use self::VacantEntryState::*;
 
-use borrow::Borrow;
-use cmp::max;
-use fmt::{self, Debug};
+use std::borrow::Borrow;
+use std::cmp::max;
+use std::fmt::{self, Debug};
 #[allow(deprecated)]
-use hash::{Hash, BuildHasher};
-use iter::FromIterator;
-use mem::{self, replace};
-use ops::{Deref, Index};
+use std::hash::{Hash, BuildHasher};
+use std::iter::FromIterator;
+use std::mem::{self, replace};
+use std::ops::{Deref, Index};
 
 use super::table::{self, Bucket, EmptyBucket, FullBucket, FullBucketMut, RawTable, SafeHash};
 use super::table::BucketState::{Empty, Full};

servo/components/hashglobe/src/hash_set.rs

@@ -8,11 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use borrow::Borrow;
-use fmt;
-use hash::{Hash, BuildHasher};
-use iter::{Chain, FromIterator};
-use ops::{BitOr, BitAnd, BitXor, Sub};
+use std::borrow::Borrow;
+use std::fmt;
+use std::hash::{Hash, BuildHasher};
+use std::iter::{Chain, FromIterator};
+use std::ops::{BitOr, BitAnd, BitXor, Sub};
 
 use super::Recover;
 use super::hash_map::{self, HashMap, Keys, RandomState};

servo/components/hashglobe/src/lib.rs

@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-pub use std::*;
-
 extern crate heapsize;
 
 mod alloc;

servo/components/hashglobe/src/table.rs

@@ -9,13 +9,12 @@
 // except according to those terms.
 
 use alloc::{alloc, dealloc};
-use cmp;
-use hash::{BuildHasher, Hash, Hasher};
-use marker;
-use mem::{align_of, size_of};
-use mem;
-use ops::{Deref, DerefMut};
-use ptr;
+use std::cmp;
+use std::hash::{BuildHasher, Hash, Hasher};
+use std::marker;
+use std::mem::{self, align_of, size_of};
+use std::ops::{Deref, DerefMut};
+use std::ptr;
 use shim::{Unique, Shared};
 
 use self::BucketState::*;