From 02fe616b8650952dcb112cbfadd66a18ed419cb7 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Tue, 5 Sep 2017 13:56:15 -0700 Subject: [PATCH] Clean imports in hashglobe --- components/hashglobe/src/hash_map.rs | 14 +++++++------- components/hashglobe/src/hash_set.rs | 10 +++++----- components/hashglobe/src/lib.rs | 2 -- components/hashglobe/src/table.rs | 13 ++++++------- 4 files changed, 18 insertions(+), 21 deletions(-) diff --git a/components/hashglobe/src/hash_map.rs b/components/hashglobe/src/hash_map.rs index a8fc574eb04f..c73f88cef66d 100644 --- a/components/hashglobe/src/hash_map.rs +++ b/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}; diff --git a/components/hashglobe/src/hash_set.rs b/components/hashglobe/src/hash_set.rs index a7fe6531f2c5..f712d1af6007 100644 --- a/components/hashglobe/src/hash_set.rs +++ b/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}; diff --git a/components/hashglobe/src/lib.rs b/components/hashglobe/src/lib.rs index 4dc683d023d5..a8b6fb2ffb11 100644 --- a/components/hashglobe/src/lib.rs +++ b/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; diff --git a/components/hashglobe/src/table.rs b/components/hashglobe/src/table.rs index cb8233562773..45dcb2673fa2 100644 --- a/components/hashglobe/src/table.rs +++ b/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::*;