guard page and bail:meme

rust/ares/Cargo.toml

@@ -18,8 +18,8 @@ ares_macros = { path = "../ares_macros" }
 # ares_pma = { path = "../ares_pma", features=["debug_prints"] }
 ares_pma = { path = "../ares_pma" }
 # use this when debugging requires allocation (e.g. eprintln)
-# assert_no_alloc = { path = "../assert-no-alloc", features=["warn_debug"] }
-assert_no_alloc = { path = "../assert-no-alloc" }
+# assert_no_alloc = { path = "../rust-assert-no-alloc", features=["warn_debug"] }
+assert_no_alloc = { path = "../rust-assert-no-alloc" }
 bitvec = "1.0.0"
 criterion = "0.4"
 either = "1.9.0"

rust/ares/src/guard.rs

@@ -2,7 +2,6 @@ use crate::interpreter::{Error, Mote, Result};
 use crate::noun::D;
 use ares_guard::*;
 use assert_no_alloc::permit_alloc;
-use std::convert::TryFrom;
 use std::ffi::c_void;
 use std::marker::PhantomData;
 
@@ -41,15 +40,6 @@ impl<'closure> CCallback<'closure> {
     {
         let function: unsafe extern "C" fn(*mut c_void) -> *mut c_void = Self::call_closure::<F>;
 
-        // debug_assert_eq!(
-        //     std::mem::size_of::<&'closure mut F>(),
-        //     std::mem::size_of::<*const c_void>()
-        // );
-        // debug_assert_eq!(
-        //     std::mem::size_of_val(&function),
-        //     std::mem::size_of::<*const c_void>()
-        // );
-
         Self {
             function,
             input: closure as *mut F as *mut c_void,
@@ -95,7 +85,7 @@ pub fn call_with_guard<F: FnMut() -> Result>(
                 *result_box
             })
         } else {
-            let err = GuardError::from(u32::try_from(res).unwrap());
+            let err = GuardError::from(res);
             match err {
                 GuardError::OutOfMemory => Err(Error::NonDeterministic(Mote::Meme, D(0))),
                 _ => {