X-Git-Url: https://git.chrismorgan.info/anymap/blobdiff_plain/f38113a9cfc9aa6f29224ae0020f0fd3bffe2818..7866ca8d779805dc3a3134f2d247889a1721633c:/src/raw.rs?ds=sidebyside

diff --git a/src/raw.rs b/src/raw.rs
index 3645429..0094b34 100644
--- a/src/raw.rs
+++ b/src/raw.rs
@@ -5,11 +5,12 @@
 use std::any::TypeId;
 use std::borrow::Borrow;
 use std::collections::hash_map::{self, HashMap};
+use std::convert::TryInto;
 use std::hash::Hash;
 use std::hash::{Hasher, BuildHasherDefault};
+#[cfg(test)]
 use std::mem;
 use std::ops::{Index, IndexMut};
-use std::ptr;
 
 use any::{Any, UncheckedAnyExt};
 
@@ -21,11 +22,13 @@ struct TypeIdHasher {
 impl Hasher for TypeIdHasher {
     #[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(mem::transmute(&bytes[0]), &mut self.value, 1)
-        }
+        // This expects to receive exactly one 64-bit value, and there’s no realistic chance of
+        // that changing, but I don’t want to depend on something that isn’t expressly part of the
+        // contract for safety. But I’m OK with release builds putting everything in one bucket
+        // if it *did* change (and debug builds panicking).
+        debug_assert_eq!(bytes.len(), 8);
+        let _ = bytes.try_into()
+            .map(|array| self.value = u64::from_ne_bytes(array));
     }
 
     #[inline]
@@ -55,12 +58,13 @@ fn type_id_hasher() {
 /// contents of an `Map`. However, because you will then be dealing with `Any` trait objects, it
 /// 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> {
+pub struct RawMap<A: ?Sized + UncheckedAnyExt = dyn Any> {
     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.
 impl<A: ?Sized + UncheckedAnyExt> Clone for RawMap<A> where Box<A>: Clone {
+    #[inline]
     fn clone(&self) -> RawMap<A> {
         RawMap {
             inner: self.inner.clone(),
@@ -68,12 +72,6 @@ impl<A: ?Sized + UncheckedAnyExt> Clone for RawMap<A> where Box<A>: Clone {
     }
 }
 
-impl<A: ?Sized + UncheckedAnyExt> Default for RawMap<A> {
-    fn default() -> RawMap<A> {
-        RawMap::new()
-    }
-}
-
 impl_common_methods! {
     field: RawMap.inner;
     new() => HashMap::with_hasher(Default::default());
@@ -167,6 +165,7 @@ impl<A: ?Sized + UncheckedAnyExt> RawMap<A> {
     }
 
     /// Gets the entry for the given type in the collection for in-place manipulation.
+    #[inline]
     pub fn entry(&mut self, key: TypeId) -> Entry<A> {
         match self.inner.entry(key) {
             hash_map::Entry::Occupied(e) => Entry::Occupied(OccupiedEntry {
@@ -182,6 +181,7 @@ impl<A: ?Sized + UncheckedAnyExt> RawMap<A> {
     ///
     /// The key may be any borrowed form of the map's key type, but `Hash` and `Eq` on the borrowed
     /// form *must* match those for the key type.
+    #[inline]
     pub fn get<Q: ?Sized>(&self, k: &Q) -> Option<&A>
     where TypeId: Borrow<Q>, Q: Hash + Eq {
         self.inner.get(k).map(|x| &**x)
@@ -191,6 +191,7 @@ impl<A: ?Sized + UncheckedAnyExt> RawMap<A> {
     ///
     /// The key may be any borrowed form of the map's key type, but `Hash` and `Eq` on the borrowed
     /// form *must* match those for the key type.
+    #[inline]
     pub fn contains_key<Q: ?Sized>(&self, k: &Q) -> bool
     where TypeId: Borrow<Q>, Q: Hash + Eq {
         self.inner.contains_key(k)
@@ -200,6 +201,7 @@ impl<A: ?Sized + UncheckedAnyExt> RawMap<A> {
     ///
     /// The key may be any borrowed form of the map's key type, but `Hash` and `Eq` on the borrowed
     /// form *must* match those for the key type.
+    #[inline]
     pub fn get_mut<Q: ?Sized>(&mut self, k: &Q) -> Option<&mut A>
     where TypeId: Borrow<Q>, Q: Hash + Eq {
         self.inner.get_mut(k).map(|x| &mut **x)
@@ -210,6 +212,7 @@ impl<A: ?Sized + UncheckedAnyExt> RawMap<A> {
     ///
     /// It is the caller’s responsibility to ensure that the key corresponds with the type ID of
     /// the value. If they do not, memory safety may be violated.
+    #[inline]
     pub unsafe fn insert(&mut self, key: TypeId, value: Box<A>) -> Option<Box<A>> {
         self.inner.insert(key, value)
     }
@@ -219,6 +222,7 @@ impl<A: ?Sized + UncheckedAnyExt> RawMap<A> {
     ///
     /// The key may be any borrowed form of the map's key type, but `Hash` and `Eq` on the borrowed
     /// form *must* match those for the key type.
+    #[inline]
     pub fn remove<Q: ?Sized>(&mut self, k: &Q) -> Option<Box<A>>
     where TypeId: Borrow<Q>, Q: Hash + Eq {
         self.inner.remove(k)
@@ -229,12 +233,14 @@ 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;
 
+    #[inline]
     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 {
+    #[inline]
     fn index_mut(&mut self, index: Q) -> &mut A {
         self.get_mut(&index).expect("no entry found for key")
     }
@@ -244,6 +250,7 @@ impl<A: ?Sized + UncheckedAnyExt> IntoIterator for RawMap<A> {
     type Item = Box<A>;
     type IntoIter = IntoIter<A>;
 
+    #[inline]
     fn into_iter(self) -> IntoIter<A> {
         IntoIter {
             inner: self.inner.into_iter(),
@@ -275,6 +282,7 @@ impl<'a, A: ?Sized + UncheckedAnyExt> Entry<'a, A> {
     ///
     /// It is the caller’s responsibility to ensure that the key of the entry corresponds with
     /// the type ID of `value`. If they do not, memory safety may be violated.
+    #[inline]
     pub unsafe fn or_insert(self, default: Box<A>) -> &'a mut A {
         match self {
             Entry::Occupied(inner) => inner.into_mut(),
@@ -287,6 +295,7 @@ impl<'a, A: ?Sized + UncheckedAnyExt> Entry<'a, A> {
     ///
     /// It is the caller’s responsibility to ensure that the key of the entry corresponds with
     /// the type ID of `value`. If they do not, memory safety may be violated.
+    #[inline]
     pub unsafe fn or_insert_with<F: FnOnce() -> Box<A>>(self, default: F) -> &'a mut A {
         match self {
             Entry::Occupied(inner) => inner.into_mut(),
@@ -297,17 +306,20 @@ impl<'a, A: ?Sized + UncheckedAnyExt> Entry<'a, A> {
 
 impl<'a, A: ?Sized + UncheckedAnyExt> OccupiedEntry<'a, A> {
     /// Gets a reference to the value in the entry.
+    #[inline]
     pub fn get(&self) -> &A {
         &**self.inner.get() 
     }
 
     /// Gets a mutable reference to the value in the entry.
+    #[inline]
     pub fn get_mut(&mut self) -> &mut A {
         &mut **self.inner.get_mut()
     }
 
     /// Converts the OccupiedEntry into a mutable reference to the value in the entry
     /// with a lifetime bound to the collection itself.
+    #[inline]
     pub fn into_mut(self) -> &'a mut A {
         &mut **self.inner.into_mut()
     }
@@ -316,11 +328,13 @@ impl<'a, A: ?Sized + UncheckedAnyExt> OccupiedEntry<'a, A> {
     ///
     /// It is the caller’s responsibility to ensure that the key of the entry corresponds with
     /// the type ID of `value`. If they do not, memory safety may be violated.
+    #[inline]
     pub unsafe fn insert(&mut self, value: Box<A>) -> Box<A> {
         self.inner.insert(value)
     }
 
     /// Takes the value out of the entry, and returns it.
+    #[inline]
     pub fn remove(self) -> Box<A> {
         self.inner.remove()
     }
@@ -332,6 +346,7 @@ impl<'a, A: ?Sized + UncheckedAnyExt> VacantEntry<'a, A> {
     ///
     /// It is the caller’s responsibility to ensure that the key of the entry corresponds with
     /// the type ID of `value`. If they do not, memory safety may be violated.
+    #[inline]
     pub unsafe fn insert(self, value: Box<A>) -> &'a mut A {
         &mut **self.inner.insert(value)
     }