Clean up types.

src/api/call_fn.rs

@@ -5,8 +5,8 @@ use crate::eval::{Caches, GlobalRuntimeState};
 use crate::types::dynamic::Variant;
 use crate::types::RestoreOnDrop;
 use crate::{
-    reify, Dynamic, Engine, FuncArgs, Position, RhaiResult, RhaiResultOf, Scope, Shared, StaticVec,
-    AST, ERR,
+    reify, Dynamic, Engine, FuncArgs, Position, RhaiResult, RhaiResultOf, Scope, SharedModule,
+    StaticVec, AST, ERR,
 };
 use std::any::{type_name, TypeId};
 #[cfg(feature = "no_std")]
@@ -249,7 +249,7 @@ impl Engine {
         arg_values: &mut [Dynamic],
     ) -> RhaiResult {
         let statements = ast.statements();
-        let lib = &[AsRef::<Shared<_>>::as_ref(ast).clone()];
+        let lib = &[AsRef::<SharedModule>::as_ref(ast).clone()];
         let mut this_ptr = this_ptr;
 
         let orig_scope_len = scope.len();
@@ -260,7 +260,7 @@ impl Engine {
             ast.resolver().cloned(),
         );
         #[cfg(not(feature = "no_module"))]
-        let global = &mut *RestoreOnDrop::new(global, move |g| {
+        let global = &mut *RestoreOnDrop::lock(global, move |g| {
             g.embedded_module_resolver = orig_embedded_module_resolver
         });
 

src/api/eval.rs

@@ -196,7 +196,7 @@ impl Engine {
             global.debugger.status = crate::eval::DebuggerStatus::Terminate;
             let lib = &[
                 #[cfg(not(feature = "no_function"))]
-                AsRef::<crate::Shared<_>>::as_ref(ast).clone(),
+                AsRef::<crate::SharedModule>::as_ref(ast).clone(),
             ];
             let node = &crate::ast::Stmt::Noop(Position::NONE);
             self.run_debugger(global, caches, lib, 0, scope, &mut None, node)?;
@@ -227,7 +227,7 @@ impl Engine {
             ast.resolver().cloned(),
         );
         #[cfg(not(feature = "no_module"))]
-        let global = &mut *RestoreOnDrop::new(global, move |g| {
+        let global = &mut *RestoreOnDrop::lock(global, move |g| {
             g.embedded_module_resolver = orig_embedded_module_resolver
         });
 
@@ -239,7 +239,7 @@ impl Engine {
 
         let lib = &[
             #[cfg(not(feature = "no_function"))]
-            AsRef::<crate::Shared<_>>::as_ref(ast).clone(),
+            AsRef::<crate::SharedModule>::as_ref(ast).clone(),
         ];
 
         self.eval_global_statements(global, caches, lib, level, scope, statements)
@@ -258,7 +258,7 @@ impl Engine {
         &self,
         global: &mut GlobalRuntimeState,
         caches: &mut Caches,
-        lib: &[crate::Shared<crate::Module>],
+        lib: &[crate::SharedModule],
         level: usize,
         scope: &mut Scope,
         statements: &[crate::ast::Stmt],

src/api/register.rs

@@ -4,6 +4,7 @@ use crate::func::{FnCallArgs, RegisterNativeFunction, SendSync};
 use crate::types::dynamic::Variant;
 use crate::{
     Engine, FnAccess, FnNamespace, Identifier, Module, NativeCallContext, RhaiResultOf, Shared,
+    SharedModule,
 };
 use std::any::{type_name, TypeId};
 #[cfg(feature = "no_std")]
@@ -636,7 +637,7 @@ impl Engine {
     /// When searching for functions, modules loaded later are preferred. In other words, loaded
     /// modules are searched in reverse order.
     #[inline(always)]
-    pub fn register_global_module(&mut self, module: Shared<Module>) -> &mut Self {
+    pub fn register_global_module(&mut self, module: SharedModule) -> &mut Self {
         // Insert the module into the front.
         // The first module is always the global namespace.
         self.global_modules.insert(1, module);
@@ -661,7 +662,7 @@ impl Engine {
     /// let mut module = Module::new();
     /// module.set_native_fn("calc", |x: i64| Ok(x + 1));
     ///
-    /// let module: Shared<Module> = module.into();
+    /// let module: SharedModule = module.into();
     ///
     /// engine
     ///     // Register the module as a fixed sub-module
@@ -680,12 +681,12 @@ impl Engine {
     pub fn register_static_module(
         &mut self,
         name: impl AsRef<str>,
-        module: Shared<Module>,
+        module: SharedModule,
     ) -> &mut Self {
         fn register_static_module_raw(
-            root: &mut std::collections::BTreeMap<Identifier, Shared<Module>>,
+            root: &mut std::collections::BTreeMap<Identifier, SharedModule>,
             name: &str,
-            module: Shared<Module>,
+            module: SharedModule,
         ) {
             let separator = crate::tokenizer::Token::DoubleColon.syntax();
             let separator = separator.as_ref();

src/api/run.rs

@@ -2,7 +2,7 @@
 
 use crate::eval::{Caches, GlobalRuntimeState};
 use crate::parser::ParseState;
-use crate::{Engine, RhaiResultOf, Scope, AST};
+use crate::{Engine, RhaiResultOf, Scope, SharedModule, AST};
 #[cfg(feature = "no_std")]
 use std::prelude::v1::*;
 
@@ -122,9 +122,9 @@ impl Engine {
 
         let statements = ast.statements();
         if !statements.is_empty() {
-            let lib: &[crate::Shared<crate::Module>] = &[
+            let lib: &[SharedModule] = &[
                 #[cfg(not(feature = "no_function"))]
-                AsRef::<crate::Shared<crate::Module>>::as_ref(ast).clone(),
+                AsRef::<SharedModule>::as_ref(ast).clone(),
             ];
             let lib = if lib.first().map_or(true, |m| m.is_empty()) {
                 &[][..]
@@ -139,7 +139,7 @@ impl Engine {
             global.debugger.status = crate::eval::DebuggerStatus::Terminate;
             let lib = &[
                 #[cfg(not(feature = "no_function"))]
-                AsRef::<crate::Shared<_>>::as_ref(ast).clone(),
+                AsRef::<crate::SharedModule>::as_ref(ast).clone(),
             ];
             let node = &crate::ast::Stmt::Noop(crate::Position::NONE);
             self.run_debugger(global, caches, lib, 0, scope, &mut None, node)?;