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 metadata = ["serde", "serde_json", "rhai_codegen/metadata", "smartstring/serde"] # enable exporting functions metadata
internals = [] # expose internal data structures internals = [] # expose internal data structures
debugging = ["internals"] # enable debugging debugging = ["internals"] # enable debugging
static_hash = []
serde = ["dep:serde", "smartstring/serde", "smallvec/serde"] # implement serde for rhai types serde = ["dep:serde", "smartstring/serde", "smallvec/serde"] # implement serde for rhai types
# compiling for no-std # 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. // 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-changed=build.template");
println!("cargo:rerun-if-env-changed=RHAI_AHASH_SEED"); println!("cargo:rerun-if-env-changed=RHAI_AHASH_SEED");
if !cfg!(feature = "stable_hash") {
let mut contents = String::new(); let mut contents = String::new();
File::open("build.template") File::open("build.template")
@ -24,5 +23,4 @@ fn main() {
.expect("cannot create `config.rs`") .expect("cannot create `config.rs`")
.write_all(contents.as_bytes()) .write_all(contents.as_bytes())
.expect("cannot write to `config/hashing.rs`"); .expect("cannot write to `config/hashing.rs`");
}
} }

103
build.template
View File

@ -10,44 +10,38 @@
//! E.g. `env RHAI_AHASH_SEED ="[236,800,954,213]"` //! 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 // [236,800,954,213], haha funny yume nikki reference epic uboachan face numberworld nexus moment 100
pub use internal::get_ahash_seed; use core::{
#[cfg(feature = "static_hash")]
pub use internal::set_ahash_seed;
#[cfg(feature = "static_hash")]
mod internal {
use core::{
cell::UnsafeCell, cell::UnsafeCell,
marker::PhantomData, marker::PhantomData,
mem::MaybeUninit, mem::MaybeUninit,
panic::{RefUnwindSafe, UnwindSafe},
sync::atomic::{AtomicBool, Ordering}, sync::atomic::{AtomicBool, Ordering},
panic::{RefUnwindSafe, UnwindSafe} };
};
struct SusLock<T> where T: 'static { // Safety: lol
struct SusLock<T>
where
T: 'static,
{
initalized: AtomicBool, initalized: AtomicBool,
data: UnsafeCell<MaybeUninit<T>>, data: UnsafeCell<MaybeUninit<T>>,
_marker: PhantomData<T>, _marker: PhantomData<T>,
} }
impl<T> SusLock<T> { impl<T> SusLock<T> {
pub const fn new() -> SusLock<T> { pub const fn new() -> SusLock<T> {
SusLock { SusLock {
initalized: AtomicBool::new(false), initalized: AtomicBool::new(false),
data: UnsafeCell::new(MaybeUninit::uninit()), data: UnsafeCell::new(MaybeUninit::uninit()),
_marker: PhantomData _marker: PhantomData,
} }
} }
pub fn get(&self) -> Option<&T> { pub fn get(&self) -> Option<&T> {
if self.initalized.load(Ordering::SeqCst) { if self.initalized.load(Ordering::SeqCst) {
Some( Some(unsafe { (&*self.data.get()).assume_init_ref() })
unsafe {
(&*self.data.get()).assume_init_ref()
}
)
} else { } else {
return None return None;
} }
} }
@ -71,59 +65,48 @@ mod internal {
Ok(()) Ok(())
} }
} }
} }
unsafe impl<T: Sync + Send> Sync for SusLock<T> {} unsafe impl<T: Sync + Send> Sync for SusLock<T> {}
unsafe impl<T: Send> Send for SusLock<T> {} unsafe impl<T: Send> Send for SusLock<T> {}
impl<T: RefUnwindSafe + UnwindSafe> RefUnwindSafe for SusLock<T> {} impl<T: RefUnwindSafe + UnwindSafe> RefUnwindSafe for SusLock<T> {}
impl<T> Drop for SusLock<T> { impl<T> Drop for SusLock<T> {
fn drop(&mut self) { fn drop(&mut self) {
if self.initalized.load(Ordering::SeqCst) { if self.initalized.load(Ordering::SeqCst) {
unsafe { (&mut *self.data.get()).assume_init_drop() }; unsafe { (&mut *self.data.get()).assume_init_drop() };
} }
} }
} }
static AHASH_SEED: SusLock<Option<[u64; 4]>> = SusLock::new(); static AHASH_SEED: SusLock<Option<[u64; 4]>> = SusLock::new();
// #[doc(cfg(feature = "stable_hash"))] // #[doc(cfg(feature = "stable_hash"))]
/// Sets the Rhai Ahash seed. This is used to hash functions and the like. /// Sets the Rhai Ahash seed. This is used to hash functions and the like.
/// ///
/// This is a global variable, and thus will affect every Rhai instance. /// This is a global variable, and thus will affect every Rhai instance.
/// This should not be used _unless_ you know you need it. /// This should not be used _unless_ you know you need it.
/// ///
/// # Warnings /// # Warnings
/// - You can only call this function **ONCE** for the whole of your program execution. /// - You can only call this function **ONCE** for the whole of your program execution.
/// - You should gracefully handle the `Err(())`. /// - You should gracefully handle the `Err(())`.
/// - You **MUST** call this before **ANY** Rhai operation occurs (e.g. creating an [`Engine`]). /// - You **MUST** call this before **ANY** Rhai operation occurs (e.g. creating an [`Engine`]).
/// ///
/// # Errors /// # Errors
/// This will error if the AHashSeed is already set. /// This will error if the AHashSeed is already set.
pub fn set_ahash_seed(new_seed: Option<[u64; 4]>) -> Result<(), Option<[u64; 4]>> { pub fn set_ahash_seed(new_seed: Option<[u64; 4]>) -> Result<(), Option<[u64; 4]>> {
AHASH_SEED.set(new_seed) AHASH_SEED.set(new_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_rhai_ahash_seed`] for more.
pub fn get_ahash_seed() -> Option<[u64; 4]> {
const FUNNY_YUMENIKKI_REFERENCE: [u64; 4] = [236,800,954,213];
AHASH_SEED.get_or_init(|| Some(FUNNY_YUMENIKKI_REFERENCE)).map(|x| *x).flatten()
}
} }
#[cfg(not(feature = "static_hash"))] /// Gets the current Rhai Ahash Seed. If the seed is not yet defined, this will automatically set a seed.
mod internal { /// The default seed is not stable and may change between versions.
const AHASH_SEED: Option<[u64; 4]> = {{ AHASH_SEED }}; ///
/// See [`set_rhai_ahash_seed`] for more.
pub fn get_ahash_seed() -> Option<[u64; 4]> {
const FUNNY_YUMENIKKI_REFERENCE: 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 AHASH_SEED
} .get_or_init(|| FUNNY_YUMENIKKI_REFERENCE)
.map(|x| *x)
.flatten()
} }

103
src/config/hashing.rs
View File

@ -10,44 +10,38 @@
//! E.g. `env RHAI_AHASH_SEED ="[236,800,954,213]"` //! 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 // [236,800,954,213], haha funny yume nikki reference epic uboachan face numberworld nexus moment 100
pub use internal::get_ahash_seed; use core::{
#[cfg(feature = "static_hash")]
pub use internal::set_ahash_seed;
#[cfg(feature = "static_hash")]
mod internal {
use core::{
cell::UnsafeCell, cell::UnsafeCell,
marker::PhantomData, marker::PhantomData,
mem::MaybeUninit, mem::MaybeUninit,
panic::{RefUnwindSafe, UnwindSafe},
sync::atomic::{AtomicBool, Ordering}, sync::atomic::{AtomicBool, Ordering},
panic::{RefUnwindSafe, UnwindSafe} };
};
struct SusLock<T> where T: 'static { // Safety: lol
struct SusLock<T>
where
T: 'static,
{
initalized: AtomicBool, initalized: AtomicBool,
data: UnsafeCell<MaybeUninit<T>>, data: UnsafeCell<MaybeUninit<T>>,
_marker: PhantomData<T>, _marker: PhantomData<T>,
} }
impl<T> SusLock<T> { impl<T> SusLock<T> {
pub const fn new() -> SusLock<T> { pub const fn new() -> SusLock<T> {
SusLock { SusLock {
initalized: AtomicBool::new(false), initalized: AtomicBool::new(false),
data: UnsafeCell::new(MaybeUninit::uninit()), data: UnsafeCell::new(MaybeUninit::uninit()),
_marker: PhantomData _marker: PhantomData,
} }
} }
pub fn get(&self) -> Option<&T> { pub fn get(&self) -> Option<&T> {
if self.initalized.load(Ordering::SeqCst) { if self.initalized.load(Ordering::SeqCst) {
Some( Some(unsafe { (&*self.data.get()).assume_init_ref() })
unsafe {
(&*self.data.get()).assume_init_ref()
}
)
} else { } else {
return None return None;
} }
} }
@ -71,59 +65,48 @@ mod internal {
Ok(()) Ok(())
} }
} }
} }
unsafe impl<T: Sync + Send> Sync for SusLock<T> {} unsafe impl<T: Sync + Send> Sync for SusLock<T> {}
unsafe impl<T: Send> Send for SusLock<T> {} unsafe impl<T: Send> Send for SusLock<T> {}
impl<T: RefUnwindSafe + UnwindSafe> RefUnwindSafe for SusLock<T> {} impl<T: RefUnwindSafe + UnwindSafe> RefUnwindSafe for SusLock<T> {}
impl<T> Drop for SusLock<T> { impl<T> Drop for SusLock<T> {
fn drop(&mut self) { fn drop(&mut self) {
if self.initalized.load(Ordering::SeqCst) { if self.initalized.load(Ordering::SeqCst) {
unsafe { (&mut *self.data.get()).assume_init_drop() }; unsafe { (&mut *self.data.get()).assume_init_drop() };
} }
} }
} }
static AHASH_SEED: SusLock<Option<[u64; 4]>> = SusLock::new(); static AHASH_SEED: SusLock<Option<[u64; 4]>> = SusLock::new();
// #[doc(cfg(feature = "stable_hash"))] // #[doc(cfg(feature = "stable_hash"))]
/// Sets the Rhai Ahash seed. This is used to hash functions and the like. /// Sets the Rhai Ahash seed. This is used to hash functions and the like.
/// ///
/// This is a global variable, and thus will affect every Rhai instance. /// This is a global variable, and thus will affect every Rhai instance.
/// This should not be used _unless_ you know you need it. /// This should not be used _unless_ you know you need it.
/// ///
/// # Warnings /// # Warnings
/// - You can only call this function **ONCE** for the whole of your program execution. /// - You can only call this function **ONCE** for the whole of your program execution.
/// - You should gracefully handle the `Err(())`. /// - You should gracefully handle the `Err(())`.
/// - You **MUST** call this before **ANY** Rhai operation occurs (e.g. creating an [`Engine`]). /// - You **MUST** call this before **ANY** Rhai operation occurs (e.g. creating an [`Engine`]).
/// ///
/// # Errors /// # Errors
/// This will error if the AHashSeed is already set. /// This will error if the AHashSeed is already set.
pub fn set_ahash_seed(new_seed: Option<[u64; 4]>) -> Result<(), Option<[u64; 4]>> { pub fn set_ahash_seed(new_seed: Option<[u64; 4]>) -> Result<(), Option<[u64; 4]>> {
AHASH_SEED.set(new_seed) AHASH_SEED.set(new_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_rhai_ahash_seed`] for more.
pub fn get_ahash_seed() -> Option<[u64; 4]> {
const FUNNY_YUMENIKKI_REFERENCE: [u64; 4] = [236,800,954,213];
AHASH_SEED.get_or_init(|| Some(FUNNY_YUMENIKKI_REFERENCE)).map(|x| *x).flatten()
}
} }
#[cfg(not(feature = "static_hash"))] /// Gets the current Rhai Ahash Seed. If the seed is not yet defined, this will automatically set a seed.
mod internal { /// The default seed is not stable and may change between versions.
const AHASH_SEED: Option<[u64; 4]> = None; ///
/// See [`set_rhai_ahash_seed`] for more.
pub fn get_ahash_seed() -> Option<[u64; 4]> {
const FUNNY_YUMENIKKI_REFERENCE: 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 AHASH_SEED
} .get_or_init(|| FUNNY_YUMENIKKI_REFERENCE)
.map(|x| *x)
.flatten()
} }