X-Git-Url: https://git.chrismorgan.info/anymap/blobdiff_plain/82f41caeb9424c7111f670618f140a938c82604e..f38113a9cfc9aa6f29224ae0020f0fd3bffe2818:/src/raw.rs

diff --git a/src/raw.rs b/src/raw.rs
index 3d1be50..3645429 100644
--- a/src/raw.rs
+++ b/src/raw.rs
@@ -5,52 +5,47 @@
 use std::any::TypeId;
 use std::borrow::Borrow;
 use std::collections::hash_map::{self, HashMap};
-#[cfg(feature = "unstable")]
-use std::collections::hash_state::HashState;
 use std::hash::Hash;
-#[cfg(feature = "unstable")]
-use std::hash::Hasher;
-#[cfg(feature = "unstable")]
+use std::hash::{Hasher, BuildHasherDefault};
 use std::mem;
 use std::ops::{Index, IndexMut};
-#[cfg(feature = "unstable")]
 use std::ptr;
 
 use any::{Any, UncheckedAnyExt};
 
-#[cfg(feature = "unstable")]
+#[derive(Default)]
 struct TypeIdHasher {
     value: u64,
 }
 
-#[derive(Clone)]
-#[cfg(feature = "unstable")]
-struct TypeIdState;
-
-#[cfg(feature = "unstable")]
-impl HashState for TypeIdState {
-    type Hasher = TypeIdHasher;
-
-    fn hasher(&self) -> TypeIdHasher {
-        TypeIdHasher { value: 0 }
-    }
-}
-
-#[cfg(feature = "unstable")]
 impl Hasher for TypeIdHasher {
-    #[inline(always)]
+    #[inline]
     fn write(&mut self, bytes: &[u8]) {
         // This expects to receive one and exactly one 64-bit value
         debug_assert!(bytes.len() == 8);
         unsafe {
-            ptr::copy_nonoverlapping(&mut self.value, mem::transmute(&bytes[0]), 1)
+            ptr::copy_nonoverlapping(mem::transmute(&bytes[0]), &mut self.value, 1)
         }
     }
 
-    #[inline(always)]
+    #[inline]
     fn finish(&self) -> u64 { self.value }
 }
 
+#[test]
+fn type_id_hasher() {
+    fn verify_hashing_with(type_id: TypeId) {
+        let mut hasher = TypeIdHasher::default();
+        type_id.hash(&mut hasher);
+        assert_eq!(hasher.finish(), unsafe { mem::transmute::<TypeId, u64>(type_id) });
+    }
+    // Pick a variety of types, just to demonstrate it’s all sane. Normal, zero-sized, unsized, &c.
+    verify_hashing_with(TypeId::of::<usize>());
+    verify_hashing_with(TypeId::of::<()>());
+    verify_hashing_with(TypeId::of::<str>());
+    verify_hashing_with(TypeId::of::<&str>());
+    verify_hashing_with(TypeId::of::<Vec<u8>>());
+}
 
 /// The raw, underlying form of a `Map`.
 ///
@@ -61,11 +56,7 @@ impl Hasher for TypeIdHasher {
 /// doesn’t tend to be so very useful. Still, if you need it, it’s here.
 #[derive(Debug)]
 pub struct RawMap<A: ?Sized + UncheckedAnyExt = Any> {
-    #[cfg(feature = "unstable")]
-    inner: HashMap<TypeId, Box<A>, TypeIdState>,
-
-    #[cfg(not(feature = "unstable"))]
-    inner: HashMap<TypeId, Box<A>>,
+    inner: HashMap<TypeId, Box<A>, BuildHasherDefault<TypeIdHasher>>,
 }
 
 // #[derive(Clone)] would want A to implement Clone, but in reality it’s only Box<A> that can.
@@ -83,21 +74,13 @@ impl<A: ?Sized + UncheckedAnyExt> Default for RawMap<A> {
     }
 }
 
-#[cfg(feature = "unstable")]
-impl_common_methods! {
-    field: RawMap.inner;
-    new() => HashMap::with_hash_state(TypeIdState);
-    with_capacity(capacity) => HashMap::with_capacity_and_hash_state(capacity, TypeIdState);
-}
-
-#[cfg(not(feature = "unstable"))]
 impl_common_methods! {
     field: RawMap.inner;
-    new() => HashMap::new();
-    with_capacity(capacity) => HashMap::with_capacity(capacity);
+    new() => HashMap::with_hasher(Default::default());
+    with_capacity(capacity) => HashMap::with_capacity_and_hasher(capacity, Default::default());
 }
 
-/// RawMap iterator.
+/// `RawMap` iterator.
 #[derive(Clone)]
 pub struct Iter<'a, A: ?Sized + UncheckedAnyExt> {
     inner: hash_map::Iter<'a, TypeId, Box<A>>,
@@ -111,7 +94,7 @@ impl<'a, A: ?Sized + UncheckedAnyExt> ExactSizeIterator for Iter<'a, A> {
     #[inline] fn len(&self) -> usize { self.inner.len() }
 }
 
-/// RawMap mutable iterator.
+/// `RawMap` mutable iterator.
 pub struct IterMut<'a, A: ?Sized + UncheckedAnyExt> {
     inner: hash_map::IterMut<'a, TypeId, Box<A>>,
 }
@@ -124,7 +107,7 @@ impl<'a, A: ?Sized + UncheckedAnyExt> ExactSizeIterator for IterMut<'a, A> {
     #[inline] fn len(&self) -> usize { self.inner.len() }
 }
 
-/// RawMap move iterator.
+/// `RawMap` move iterator.
 pub struct IntoIter<A: ?Sized + UncheckedAnyExt> {
     inner: hash_map::IntoIter<TypeId, Box<A>>,
 }
@@ -137,18 +120,15 @@ impl<A: ?Sized + UncheckedAnyExt> ExactSizeIterator for IntoIter<A> {
     #[inline] fn len(&self) -> usize { self.inner.len() }
 }
 
-/// RawMap drain iterator.
-#[cfg(feature = "unstable")]
+/// `RawMap` drain iterator.
 pub struct Drain<'a, A: ?Sized + UncheckedAnyExt> {
     inner: hash_map::Drain<'a, TypeId, Box<A>>,
 }
-#[cfg(feature = "unstable")]
 impl<'a, A: ?Sized + UncheckedAnyExt> Iterator for Drain<'a, A> {
     type Item = Box<A>;
     #[inline] fn next(&mut self) -> Option<Box<A>> { self.inner.next().map(|x| x.1) }
     #[inline] fn size_hint(&self) -> (usize, Option<usize>) { self.inner.size_hint() }
 }
-#[cfg(feature = "unstable")]
 impl<'a, A: ?Sized + UncheckedAnyExt> ExactSizeIterator for Drain<'a, A> {
     #[inline] fn len(&self) -> usize { self.inner.len() }
 }
@@ -180,7 +160,6 @@ impl<A: ?Sized + UncheckedAnyExt> RawMap<A> {
     ///
     /// Keeps the allocated memory for reuse.
     #[inline]
-    #[cfg(feature = "unstable")]
     pub fn drain(&mut self) -> Drain<A> {
         Drain {
             inner: self.inner.drain(),
@@ -250,13 +229,13 @@ impl<A: ?Sized + UncheckedAnyExt> RawMap<A> {
 impl<A: ?Sized + UncheckedAnyExt, Q> Index<Q> for RawMap<A> where TypeId: Borrow<Q>, Q: Eq + Hash {
     type Output = A;
 
-    fn index<'a>(&'a self, index: Q) -> &'a A {
+    fn index(&self, index: Q) -> &A {
         self.get(&index).expect("no entry found for key")
     }
 }
 
 impl<A: ?Sized + UncheckedAnyExt, Q> IndexMut<Q> for RawMap<A> where TypeId: Borrow<Q>, Q: Eq + Hash {
-    fn index_mut<'a>(&'a mut self, index: Q) -> &'a mut A {
+    fn index_mut(&mut self, index: Q) -> &mut A {
         self.get_mut(&index).expect("no entry found for key")
     }
 }