Dandellion
/
mercury
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "hash as unsafe bytes" 

This reverts commit 47610129ff.
This commit is contained in:
Daniel Olsen 2021-05-17 01:30:34 +02:00
parent 2360986a96
commit c64908621d
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/azul.rs
View File

@ -1,4 +1,4 @@
use std::{hash::{Hash, Hasher}, ops::{Deref, DerefMut}}; use std::{hash::Hash, ops::{Deref, DerefMut}};
use rand::prelude::*; use rand::prelude::*;
use rand::distributions::WeightedIndex; use rand::distributions::WeightedIndex;
//use smallvec::{SmallVec, smallvec}; //use smallvec::{SmallVec, smallvec};
@ -402,8 +402,8 @@ impl Board {
} }
} }
#[repr(packed)] //#[repr(align(16))]
#[derive(Debug, Clone, Copy, PartialEq, Eq)] #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
pub struct Game { pub struct Game {
turn: u32, turn: u32,
player: u8, player: u8,
@ -660,18 +660,6 @@ impl Game {
} }
} }
unsafe fn any_as_u8_slice<T: Sized>(p: &T) -> &[u8] {
::std::slice::from_raw_parts(
(p as *const T) as *const u8,
::std::mem::size_of::<T>(),
)
}
impl Hash for Game {
fn hash<H: Hasher>(&self, state: &mut H) {
unsafe{any_as_u8_slice(self).deref().hash(state)}
}
}
// Tests // Tests

2
src/main.rs
View File

@ -91,7 +91,7 @@ fn calculate_options() -> Result<(), &'static str> {
Ok(()) Ok(())
} }
#[cached(size=10_000_000, key = "Game", convert = r#"{ _game }"#)] #[cached(size=45_000_000, key = "Game", convert = r#"{ _game }"#)]
fn count_options(_game: Game, depth: u8, treshold: u8) -> u128 { fn count_options(_game: Game, depth: u8, treshold: u8) -> u128 {
let before = std::time::Instant::now(); let before = std::time::Instant::now();