From b9367a7de87e3867443cc47c0eb829adea565a1c Mon Sep 17 00:00:00 2001
From: Simon Gardling <titaniumtown@gmail.com>
Date: Sat, 25 Mar 2023 23:48:10 -0400
Subject: [PATCH] misc

---
 Cargo.lock      | 16 ++++++++--------
 src/lib.rs      |  4 ++--
 src/math_app.rs | 14 +++++++-------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2cb75eb..3a003c3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -586,9 +586,9 @@ dependencies = [
 
 [[package]]
 name = "cxx"
-version = "1.0.93"
+version = "1.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9c00419335c41018365ddf7e4d5f1c12ee3659ddcf3e01974650ba1de73d038"
+checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93"
 dependencies = [
  "cc",
  "cxxbridge-flags",
@@ -598,9 +598,9 @@ dependencies = [
 
 [[package]]
 name = "cxx-build"
-version = "1.0.93"
+version = "1.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb8307ad413a98fff033c8545ecf133e3257747b3bae935e7602aab8aa92d4ca"
+checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b"
 dependencies = [
  "cc",
  "codespan-reporting",
@@ -613,15 +613,15 @@ dependencies = [
 
 [[package]]
 name = "cxxbridge-flags"
-version = "1.0.93"
+version = "1.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edc52e2eb08915cb12596d29d55f0b5384f00d697a646dbd269b6ecb0fbd9d31"
+checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb"
 
 [[package]]
 name = "cxxbridge-macro"
-version = "1.0.93"
+version = "1.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "631569015d0d8d54e6c241733f944042623ab6df7bc3be7466874b05fcdb1c5f"
+checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/src/lib.rs b/src/lib.rs
index 788cc80..61f220e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -43,9 +43,9 @@ cfg_if::cfg_if! {
 	if #[cfg(target_arch = "wasm32")] {
 		use wasm_bindgen::prelude::*;
 
-		use lol_alloc::{FreeListAllocator, LockedAllocator};
+		use lol_alloc::{FreeListAllocator, AssumeSingleThreaded};
 		#[global_allocator]
-				static ALLOCATOR: LockedAllocator<FreeListAllocator> = LockedAllocator::new(FreeListAllocator::new());
+				static ALLOCATOR: AssumeSingleThreaded<FreeListAllocator> = unsafe { AssumeSingleThreaded::new(FreeListAllocator::new()) };
 
 		#[wasm_bindgen(start)]
 		pub async fn start() {
diff --git a/src/math_app.rs b/src/math_app.rs
index 4fa5292..f89c23c 100644
--- a/src/math_app.rs
+++ b/src/math_app.rs
@@ -379,16 +379,16 @@ impl MathApp {
 					#[cfg(target_arch = "wasm32")]
 					{
 						tracing::info!("Saving function data");
-						let hash: crate::misc::HashBytes = unsafe {
-							std::mem::transmute::<&str, crate::misc::HashBytes>(build::SHORT_COMMIT)
-						};
-						let saved_data = &crate::misc::hashed_storage_create(
-							&hash,
-							bincode::serialize(&self.functions).unwrap().as_slice(),
+						use crate::misc::{HashBytes, HashBytesHelper};
+						let hash: HashBytes =
+							unsafe { std::mem::transmute::<&str, HashBytes>(build::SHORT_COMMIT) };
+						let saved_data = hash.hashed_storage_create(
+							&bincode::serialize(&self.functions)
+								.expect("unable to deserialize functions"),
 						);
 						// tracing::info!("Bytes: {}", saved_data.len());
 						get_localstorage()
-							.set_item(FUNC_NAME, saved_data)
+							.set_item(FUNC_NAME, &saved_data)
 							.expect("failed to set local function storage");
 					}
 				}