Differentiate between spin_core::Engine and wasmtime::Engine

Signed-off-by: Ryan Levick <[email protected]>

Author: rylev

crates/core/src/lib.rs

@@ -18,6 +18,7 @@ use tracing::instrument;
 use wasmtime::{InstanceAllocationStrategy, PoolingAllocationConfig};
 
 pub use async_trait::async_trait;
+pub use wasmtime::Engine as WasmtimeEngine;
 pub use wasmtime::{
     self,
     component::{Component, Instance, InstancePre, Linker},

crates/core/src/store.rs

@@ -1,7 +1,7 @@
 use anyhow::Result;
 use std::time::{Duration, Instant};
 
-use crate::{limits::StoreLimitsAsync, State};
+use crate::{limits::StoreLimitsAsync, State, WasmtimeEngine};
 
 #[cfg(doc)]
 use crate::EngineBuilder;
@@ -80,14 +80,14 @@ impl<T> wasmtime::AsContextMut for Store<T> {
 ///
 /// A new [`StoreBuilder`] can be obtained with [`crate::Engine::store_builder`].
 pub struct StoreBuilder {
-    engine: wasmtime::Engine,
+    engine: WasmtimeEngine,
     epoch_tick_interval: Duration,
     store_limits: StoreLimitsAsync,
 }
 
 impl StoreBuilder {
     // Called by Engine::store_builder.
-    pub(crate) fn new(engine: wasmtime::Engine, epoch_tick_interval: Duration) -> Self {
+    pub(crate) fn new(engine: WasmtimeEngine, epoch_tick_interval: Duration) -> Self {
         Self {
             engine,
             epoch_tick_interval,

crates/factors-executor/src/lib.rs

@@ -213,7 +213,7 @@ impl<'a, T: RuntimeFactors, U> FactorsInstanceBuilder<'a, T, U> {
     }
 
     /// Returns the underlying wasmtime engine for the instance.
-    pub fn engine(&self) -> &spin_core::wasmtime::Engine {
+    pub fn wasmtime_engine(&self) -> &spin_core::WasmtimeEngine {
         self.instance_pre.engine()
     }