From 9463ff6211b3ef1c49dc0fd1568479e6833160ca Mon Sep 17 00:00:00 2001 From: Stephen Chung Date: Fri, 4 Nov 2022 22:21:21 +0800 Subject: [PATCH 1/4] Add back nightly to CI. --- .github/workflows/build.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d186abb9..e1d91692 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -71,9 +71,8 @@ jobs: # smoketests for different toolchains - {toolchain: stable, os: windows-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: nightly, os: ubuntu-latest, experimental: true, flags: ""} + - {toolchain: beta, os: ubuntu-latest, experimental: false, flags: ""} + - {toolchain: nightly, os: ubuntu-latest, experimental: true, flags: ""} fail-fast: false steps: - name: Checkout From d20837ae5ede3b06944d8e5136c361e02b8e3693 Mon Sep 17 00:00:00 2001 From: Stephen Chung Date: Fri, 4 Nov 2022 22:49:52 +0800 Subject: [PATCH 2/4] Fix CI build. --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e1d91692..996fc663 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -95,8 +95,6 @@ jobs: continue-on-error: ${{matrix.experimental}} strategy: matrix: - flags: - - "" include: - {os: ubuntu-latest, flags: "--profile unix", experimental: false} - {os: windows-latest, flags: "--profile windows", experimental: true} From 6e0f8b500771c8a8aa2d175316cee992b4e0746b Mon Sep 17 00:00:00 2001 From: Stephen Chung Date: Sat, 5 Nov 2022 10:49:34 +0800 Subject: [PATCH 3/4] Fix no-std build. --- src/config/hashing.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/hashing.rs b/src/config/hashing.rs index 58374d21..c11f7626 100644 --- a/src/config/hashing.rs +++ b/src/config/hashing.rs @@ -20,6 +20,7 @@ // [236,800,954,213], haha funny yume nikki reference epic uboachan face numberworld nexus moment 100 use crate::config::hashing_env; +use core::panic::{RefUnwindSafe, UnwindSafe}; #[cfg(feature = "no_std")] use std::prelude::v1::*; use std::{ @@ -27,7 +28,6 @@ use std::{ marker::PhantomData, mem, mem::MaybeUninit, - panic::{RefUnwindSafe, UnwindSafe}, sync::atomic::{AtomicBool, AtomicUsize, Ordering}, }; From 4455d95abc19151ec7414600efd8ea92abc58929 Mon Sep 17 00:00:00 2001 From: Stephen Chung Date: Sat, 5 Nov 2022 11:35:01 +0800 Subject: [PATCH 4/4] Fix no-std by limiting ahash to 0.8.0. --- Cargo.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 3999b7de..4db19d3b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,8 @@ categories = ["no-std", "embedded", "wasm", "parser-implementations"] [dependencies] 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 } bitflags = { version = "1", default-features = false } smartstring = { version = "1", default-features = false }