kjuulh/rhai
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

remove stable hash and fix CI

Browse Source
This commit is contained in:
l1npengtul 2022-11-01 21:25:45 +09:00
parent 79e7c305bf
commit 5816d571b3
5 changed files with 180 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.toml
View File

@ -63,7 +63,6 @@ unicode-xid-ident = ["unicode-xid"] # allow Unicode Standard Annex #31 for ident
metadata = ["serde", "serde_json", "rhai_codegen/metadata", "smartstring/serde"] # enable exporting functions metadata
internals = [] # expose internal data structures
debugging = ["internals"] # enable debugging
static_hash = []
serde = ["dep:serde", "smartstring/serde", "smallvec/serde"] # implement serde for rhai types
# compiling for no-std

2
build.rs
View File

@ -8,7 +8,6 @@ fn main() {
// Tell Cargo that if the given environment variable changes, to rerun this build script.
println!("cargo:rerun-if-changed=build.template");
println!("cargo:rerun-if-env-changed=RHAI_AHASH_SEED");
if !cfg!(feature = "stable_hash") {
let mut contents = String::new();
File::open("build.template")
@ -25,4 +24,3 @@ fn main() {
.write_all(contents.as_bytes())
.expect("cannot write to `config/hashing.rs`");
}
}

43
build.template
View File

@ -10,21 +10,19 @@
//! E.g. `env RHAI_AHASH_SEED ="[236,800,954,213]"`
// [236,800,954,213], haha funny yume nikki reference epic uboachan face numberworld nexus moment 100
pub use internal::get_ahash_seed;
#[cfg(feature = "static_hash")]
pub use internal::set_ahash_seed;
#[cfg(feature = "static_hash")]
mod internal {
use core::{
cell::UnsafeCell,
marker::PhantomData,
mem::MaybeUninit,
panic::{RefUnwindSafe, UnwindSafe},
sync::atomic::{AtomicBool, Ordering},
panic::{RefUnwindSafe, UnwindSafe}
};
struct SusLock<T> where T: 'static {
// Safety: lol
struct SusLock<T>
where
T: 'static,
{
initalized: AtomicBool,
data: UnsafeCell<MaybeUninit<T>>,
_marker: PhantomData<T>,
@ -35,19 +33,15 @@ mod internal {
SusLock {
initalized: AtomicBool::new(false),
data: UnsafeCell::new(MaybeUninit::uninit()),
_marker: PhantomData
_marker: PhantomData,
}
}
pub fn get(&self) -> Option<&T> {
if self.initalized.load(Ordering::SeqCst) {
Some(
unsafe {
(&*self.data.get()).assume_init_ref()
}
)
Some(unsafe { (&*self.data.get()).assume_init_ref() })
} else {
return None
return None;
}
}
@ -109,21 +103,10 @@ mod internal {
///
/// See [`set_rhai_ahash_seed`] for more.
pub fn get_ahash_seed() -> Option<[u64; 4]> {
const FUNNY_YUMENIKKI_REFERENCE: [u64; 4] = [236,800,954,213];
const FUNNY_YUMENIKKI_REFERENCE: Option<[u64; 4]> = {{ AHASH_SEED }};
AHASH_SEED.get_or_init(|| Some(FUNNY_YUMENIKKI_REFERENCE)).map(|x| *x).flatten()
}
}
#[cfg(not(feature = "static_hash"))]
mod internal {
const AHASH_SEED: Option<[u64; 4]> = {{ AHASH_SEED }};
/// Gets the current Rhai Ahash Seed. If the seed is not yet defined, this will automatically set a seed.
/// The default seed is not stable and may change between versions.
///
/// See [`set_ahash_seed`] for more.
pub fn get_ahash_seed() -> Option<[u64; 4]> {
AHASH_SEED
}
.get_or_init(|| FUNNY_YUMENIKKI_REFERENCE)
.map(|x| *x)
.flatten()
}

43
src/config/hashing.rs
View File

@ -10,21 +10,19 @@
//! E.g. `env RHAI_AHASH_SEED ="[236,800,954,213]"`
// [236,800,954,213], haha funny yume nikki reference epic uboachan face numberworld nexus moment 100
pub use internal::get_ahash_seed;
#[cfg(feature = "static_hash")]
pub use internal::set_ahash_seed;
#[cfg(feature = "static_hash")]
mod internal {
use core::{
cell::UnsafeCell,
marker::PhantomData,
mem::MaybeUninit,
panic::{RefUnwindSafe, UnwindSafe},
sync::atomic::{AtomicBool, Ordering},
panic::{RefUnwindSafe, UnwindSafe}
};
struct SusLock<T> where T: 'static {
// Safety: lol
struct SusLock<T>
where
T: 'static,
{
initalized: AtomicBool,
data: UnsafeCell<MaybeUninit<T>>,
_marker: PhantomData<T>,
@ -35,19 +33,15 @@ mod internal {
SusLock {
initalized: AtomicBool::new(false),
data: UnsafeCell::new(MaybeUninit::uninit()),
_marker: PhantomData
_marker: PhantomData,
}
}
pub fn get(&self) -> Option<&T> {
if self.initalized.load(Ordering::SeqCst) {
Some(
unsafe {
(&*self.data.get()).assume_init_ref()
}
)
Some(unsafe { (&*self.data.get()).assume_init_ref() })
} else {
return None
return None;
}
}
@ -109,21 +103,10 @@ mod internal {
///
/// See [`set_rhai_ahash_seed`] for more.
pub fn get_ahash_seed() -> Option<[u64; 4]> {
const FUNNY_YUMENIKKI_REFERENCE: [u64; 4] = [236,800,954,213];
const FUNNY_YUMENIKKI_REFERENCE: Option<[u64; 4]> = None;
AHASH_SEED.get_or_init(|| Some(FUNNY_YUMENIKKI_REFERENCE)).map(|x| *x).flatten()
}
}
#[cfg(not(feature = "static_hash"))]
mod internal {
const AHASH_SEED: Option<[u64; 4]> = None;
/// Gets the current Rhai Ahash Seed. If the seed is not yet defined, this will automatically set a seed.
/// The default seed is not stable and may change between versions.
///
/// See [`set_ahash_seed`] for more.
pub fn get_ahash_seed() -> Option<[u64; 4]> {
AHASH_SEED
}
.get_or_init(|| FUNNY_YUMENIKKI_REFERENCE)
.map(|x| *x)
.flatten()
}