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

Merge pull request #664 from schungx/master

Browse Source 
Fix no-std by limiting ahash to 0.8.0.
This commit is contained in:
Stephen Chung 2022-11-05 12:08:12 +08:00 committed by GitHub
commit 654256ecfe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/build.yml vendored
View File

@ -71,9 +71,8 @@ jobs:
# smoketests for different toolchains # smoketests for different toolchains
- {toolchain: stable, os: windows-latest, experimental: false, flags: ""} - {toolchain: stable, os: windows-latest, experimental: false, flags: ""}
- {toolchain: stable, os: macos-latest, experimental: false, flags: ""} - {toolchain: stable, os: macos-latest, experimental: false, flags: ""}
# data structure size changes - wait for beta to become stable and uncomment - {toolchain: beta, os: ubuntu-latest, experimental: false, flags: ""}
#- {toolchain: beta, os: ubuntu-latest, experimental: false, flags: ""} - {toolchain: nightly, os: ubuntu-latest, experimental: true, flags: ""}
#- {toolchain: nightly, os: ubuntu-latest, experimental: true, flags: ""}
fail-fast: false fail-fast: false
steps: steps:
- name: Checkout - name: Checkout
@ -96,8 +95,6 @@ jobs:
continue-on-error: ${{matrix.experimental}} continue-on-error: ${{matrix.experimental}}
strategy: strategy:
matrix: matrix:
flags:
- ""
include: include:
- {os: ubuntu-latest, flags: "--profile unix", experimental: false} - {os: ubuntu-latest, flags: "--profile unix", experimental: false}
- {os: windows-latest, flags: "--profile windows", experimental: true} - {os: windows-latest, flags: "--profile windows", experimental: true}

3
Cargo.toml
View File

@ -19,7 +19,8 @@ categories = ["no-std", "embedded", "wasm", "parser-implementations"]
[dependencies] [dependencies]
smallvec = { version = "1.7", default-features = false, features = ["union", "const_new", "const_generics"] } smallvec = { version = "1.7", default-features = false, features = ["union", "const_new", "const_generics"] }
ahash = { version = "0.8", default-features = false, features = ["compile-time-rng"] } # 0.8.1 pulls in `getrandom/js` which breaks no-std
ahash = { version = "=0.8.0", default-features = false, features = ["compile-time-rng"] }
num-traits = { version = "0.2", default-features = false } num-traits = { version = "0.2", default-features = false }
bitflags = { version = "1", default-features = false } bitflags = { version = "1", default-features = false }
smartstring = { version = "1", default-features = false } smartstring = { version = "1", default-features = false }

2
src/config/hashing.rs
View File

@ -20,6 +20,7 @@
// [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
use crate::config::hashing_env; use crate::config::hashing_env;
use core::panic::{RefUnwindSafe, UnwindSafe};
#[cfg(feature = "no_std")] #[cfg(feature = "no_std")]
use std::prelude::v1::*; use std::prelude::v1::*;
use std::{ use std::{
@ -27,7 +28,6 @@ use std::{
marker::PhantomData, marker::PhantomData,
mem, mem,
mem::MaybeUninit, mem::MaybeUninit,
panic::{RefUnwindSafe, UnwindSafe},
sync::atomic::{AtomicBool, AtomicUsize, Ordering}, sync::atomic::{AtomicBool, AtomicUsize, Ordering},
}; };