Auto merge of #18385 - Manishearth:clean-imports, r=mbrubeck

Clean imports in hashglobe

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18385)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-09-06 00:32:53 -05:00 committed by GitHub
commit f29fd77573
4 changed files with 18 additions and 21 deletions

View file

@ -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};

View file

@ -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};

View file

@ -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;

View file

@ -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::*;