Rename Imports to GlobalRuntimeState.

src/api/call_fn.rs

@@ -1,7 +1,7 @@
 //! Module that defines the `call_fn` API of [`Engine`].
 #![cfg(not(feature = "no_function"))]
 
-use crate::engine::{EvalState, Imports};
+use crate::engine::{EvalState, GlobalRuntimeState};
 use crate::types::dynamic::Variant;
 use crate::{
     Dynamic, Engine, FuncArgs, Position, RhaiResult, RhaiResultOf, Scope, StaticVec, AST, ERR,
@@ -154,13 +154,13 @@ impl Engine {
         arg_values: impl AsMut<[Dynamic]>,
     ) -> RhaiResult {
         let state = &mut EvalState::new();
-        let mods = &mut Imports::new();
+        let global = &mut GlobalRuntimeState::new();
         let statements = ast.statements();
 
         let orig_scope_len = scope.len();
 
         if eval_ast && !statements.is_empty() {
-            self.eval_global_statements(scope, mods, state, statements, &[ast.as_ref()], 0)?;
+            self.eval_global_statements(scope, global, state, statements, &[ast.as_ref()], 0)?;
 
             if rewind_scope {
                 scope.rewind(orig_scope_len);
@@ -183,7 +183,7 @@ impl Engine {
 
         let result = self.call_script_fn(
             scope,
-            mods,
+            global,
             state,
             &[ast.as_ref()],
             &mut this_ptr,

src/api/custom_syntax.rs

@@ -163,7 +163,7 @@ impl EvalContext<'_, '_, '_, '_, '_, '_, '_, '_> {
     pub fn eval_expression_tree(&mut self, expr: &Expression) -> RhaiResult {
         self.engine.eval_expr(
             self.scope,
-            self.mods,
+            self.global,
             self.state,
             self.lib,
             self.this_ptr,

src/api/eval.rs

@@ -1,6 +1,6 @@
 //! Module that defines the public evaluation API of [`Engine`].
 
-use crate::engine::{EvalState, Imports};
+use crate::engine::{EvalState, GlobalRuntimeState};
 use crate::parser::ParseState;
 use crate::types::dynamic::Variant;
 use crate::{Dynamic, Engine, Module, Position, RhaiResult, RhaiResultOf, Scope, AST, ERR};
@@ -184,9 +184,9 @@ impl Engine {
         scope: &mut Scope,
         ast: &AST,
     ) -> RhaiResultOf<T> {
-        let mods = &mut Imports::new();
+        let global = &mut GlobalRuntimeState::new();
 
-        let result = self.eval_ast_with_scope_raw(scope, mods, ast, 0)?;
+        let result = self.eval_ast_with_scope_raw(scope, global, ast, 0)?;
 
         let typ = self.map_type_name(result.type_name());
 
@@ -204,17 +204,17 @@ impl Engine {
     pub(crate) fn eval_ast_with_scope_raw<'a>(
         &self,
         scope: &mut Scope,
-        mods: &mut Imports,
+        global: &mut GlobalRuntimeState,
         ast: &'a AST,
         level: usize,
     ) -> RhaiResult {
         let mut state = EvalState::new();
         if ast.source_raw().is_some() {
-            mods.source = ast.source_raw().cloned();
+            global.source = ast.source_raw().cloned();
         }
         #[cfg(not(feature = "no_module"))]
         {
-            mods.embedded_module_resolver = ast.resolver().cloned();
+            global.embedded_module_resolver = ast.resolver().cloned();
         }
 
         let statements = ast.statements();
@@ -232,6 +232,6 @@ impl Engine {
         } else {
             &lib
         };
-        self.eval_global_statements(scope, mods, &mut state, statements, lib, level)
+        self.eval_global_statements(scope, global, &mut state, statements, lib, level)
     }
 }

src/api/run.rs

@@ -1,6 +1,6 @@
 //! Module that defines the public evaluation API of [`Engine`].
 
-use crate::engine::{EvalState, Imports};
+use crate::engine::{EvalState, GlobalRuntimeState};
 use crate::parser::ParseState;
 use crate::{Engine, Module, RhaiResultOf, Scope, AST};
 #[cfg(feature = "no_std")]
@@ -44,14 +44,14 @@ impl Engine {
     /// Evaluate an [`AST`] with own scope, returning any error (if any).
     #[inline]
     pub fn run_ast_with_scope(&self, scope: &mut Scope, ast: &AST) -> RhaiResultOf<()> {
-        let mods = &mut Imports::new();
+        let global = &mut GlobalRuntimeState::new();
         let mut state = EvalState::new();
         if ast.source_raw().is_some() {
-            mods.source = ast.source_raw().cloned();
+            global.source = ast.source_raw().cloned();
         }
         #[cfg(not(feature = "no_module"))]
         {
-            mods.embedded_module_resolver = ast.resolver().cloned();
+            global.embedded_module_resolver = ast.resolver().cloned();
         }
 
         let statements = ast.statements();
@@ -65,7 +65,7 @@ impl Engine {
             } else {
                 &lib
             };
-            self.eval_global_statements(scope, mods, &mut state, statements, lib, 0)?;
+            self.eval_global_statements(scope, global, &mut state, statements, lib, 0)?;
         }
         Ok(())
     }