more restored

core/src/error.rs

@@ -15,7 +15,7 @@ use tracing::{debug, error, info, trace, warn};
 
 #[macro_export]
 macro_rules! mize_err {
-    ($($arg:tt)*) => { MizeError::new().msg(format!( $($arg)*)) };
+    ($($arg:tt)*) => { $crate::error::MizeError::new().msg(format!( $($arg)*)) };
 }
 
 pub type MizeResult<T> = Result<T, MizeError>;

core/src/item.rs

@@ -356,7 +356,7 @@ impl ItemData {
     /// The native value must have been stored via from_native().
     /// Returns a guard that holds the lock on the native_values registry.
     pub fn native<T: Any + Send + Sync + 'static>(&self) -> MizeResult<NativeRefGuard<T>> {
-        let mize_arc = crate::c_api::GLOBAL_MIZE.get().ok_or(mize_err!("No global Mize"))?;
+        let mize_arc = crate::GLOBAL_MIZE.get().ok_or(mize_err!("No global Mize"))?;
         let mize = mize_arc.lock().map_err(|_| mize_err!("Failed to lock global Mize"))?;
         let native_values = mize.native_values.lock().map_err(|_| mize_err!("Failed to lock native_values"))?;
         
@@ -389,7 +389,7 @@ impl ItemData {
     /// The native value must have been stored via from_native().
     /// Returns a guard that holds the lock on the native_values registry.
     pub fn native_mut<T: Any + Send + Sync + 'static>(&self) -> MizeResult<NativeMutRefGuard<T>> {
-        let mize_arc = crate::c_api::GLOBAL_MIZE.get().ok_or(mize_err!("No global Mize"))?;
+        let mize_arc = crate::GLOBAL_MIZE.get().ok_or(mize_err!("No global Mize"))?;
         let mize = mize_arc.lock().map_err(|_| mize_err!("Failed to lock global Mize"))?;
         let mut native_values = mize.native_values.lock().map_err(|_| mize_err!("Failed to lock native_values"))?;
         
@@ -421,7 +421,7 @@ impl ItemData {
     /// Take the native value from this ItemData, removing it from the registry.
     /// The native value must have been stored via from_native().
     pub fn native_take<T: Any + Send + Sync + 'static>(&self) -> MizeResult<T> {
-        let mize_arc = crate::c_api::GLOBAL_MIZE.get().ok_or(mize_err!("No global Mize"))?;
+        let mize_arc = crate::GLOBAL_MIZE.get().ok_or(mize_err!("No global Mize"))?;
         let mize = mize_arc.lock().map_err(|_| mize_err!("Failed to lock global Mize"))?;
         let mut native_values = mize.native_values.lock().map_err(|_| mize_err!("Failed to lock native_values"))?;
         

core/src/lib.rs

@@ -80,7 +80,7 @@ pub fn get_global_mize() -> MizeResult<Mize> {
 /// Set the global Mize instance.
 pub fn set_global_mize(mize: Mize) -> MizeResult<()> {
     let arc = Arc::new(Mutex::new(mize));
-    if let Errr(_) = GLOBAL_MIZE.set(arc) {
+    if let Err(_) = GLOBAL_MIZE.set(arc) {
       let a = GLOBAL_MIZE.get().unwrap();
       let mut b = a.lock();
       *b = mize;

core/src/platform/os/fsstore.rs

@@ -14,7 +14,7 @@ use crate::instance::{self, Mize};
 use crate::item::get_raw_from_cbor;
 use crate::item::IntoItemData;
 use crate::memstore::MemStore;
-use crate::{core::instance::store::Store, mize_err};
+use crate::{instance::store::Store, mize_err};
 use tokio::net::UnixStream;
 
 #[derive(Clone, Debug)]

core/src/platform/os/mod.rs

@@ -25,7 +25,7 @@ use tracing_subscriber::registry::LookupSpan;
 use std::sync::Arc;
 use std::sync::Mutex;
 
-use crate::c_api::GLOBAL_MIZE;
+use crate::GLOBAL_MIZE;
 use crate::config::ConfigOpt;
 use crate::error::{IntoMizeResult, MizeResult};
 use crate::instance::Mize;