Chris Morgan  ›  Git  ›  anymap  ›  commitdiff
removed unsafe code in favor of explicit assert
authorMarcel Hellwig <git@cookiesoft.de>
committerMarcel Hellwig <git@cookiesoft.de>
src/raw.rs patch | blob | history

diff --git a/src/raw.rs b/src/raw.rs
index 07dccf8d248ab7f7655b07af79d918a245f02f35..dbd5e2cb120e2bf8700754ed87dfa925e7853da1 100644 (file)
--- a/src/raw.rs
+++ b/src/raw.rs
@@ -10,7 +10,6 @@ use std::hash::{Hasher, BuildHasherDefault};
 #[cfg(test)]
 use std::mem;
 use std::ops::{Index, IndexMut};
 #[cfg(test)]
 use std::mem;
 use std::ops::{Index, IndexMut};
-use std::ptr;
 
 use any::{Any, UncheckedAnyExt};
 
 
 use any::{Any, UncheckedAnyExt};
 
@@ -23,10 +22,11 @@ impl Hasher for TypeIdHasher {
     #[inline]
     fn write(&mut self, bytes: &[u8]) {
         // This expects to receive one and exactly one 64-bit value
     #[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(&bytes[0] as *const u8 as *const u64, &mut self.value, 1)
-        }
+        assert!(bytes.len() == 8);
+        self.value = u64::from(bytes[0])       | u64::from(bytes[1]) << 8  |
+                     u64::from(bytes[2]) << 16 | u64::from(bytes[3]) << 24 |
+                     u64::from(bytes[4]) << 32 | u64::from(bytes[5]) << 40 |
+                     u64::from(bytes[6]) << 48 | u64::from(bytes[7]) << 56;
     }
 
     #[inline]
     }
 
     #[inline]