Move encapsulated environment out of ScriptFnDef.

src/ast/ast.rs

@@ -750,10 +750,8 @@ impl AST {
     #[cfg(feature = "internals")]
     #[cfg(not(feature = "no_function"))]
     #[inline]
-    pub fn iter_fn_def(&self) -> impl Iterator<Item = &super::ScriptFnDef> {
-        self.lib
-            .iter_script_fn()
-            .map(|(.., fn_def)| fn_def.as_ref())
+    pub fn iter_fn_def(&self) -> impl Iterator<Item = &crate::Shared<super::ScriptFnDef>> {
+        self.lib.iter_script_fn().map(|(.., fn_def)| fn_def)
     }
     /// Iterate through all function definitions.
     ///
@@ -762,10 +760,8 @@ impl AST {
     #[cfg(not(feature = "no_function"))]
     #[allow(dead_code)]
     #[inline]
-    pub(crate) fn iter_fn_def(&self) -> impl Iterator<Item = &super::ScriptFnDef> {
-        self.lib
-            .iter_script_fn()
-            .map(|(.., fn_def)| fn_def.as_ref())
+    pub(crate) fn iter_fn_def(&self) -> impl Iterator<Item = &crate::Shared<super::ScriptFnDef>> {
+        self.lib.iter_script_fn().map(|(.., fn_def)| fn_def)
     }
     /// Iterate through all function definitions.
     ///

src/ast/mod.rs

@@ -19,9 +19,6 @@ pub use ident::Ident;
 pub use namespace::Namespace;
 #[cfg(feature = "no_module")]
 pub use namespace_none::Namespace;
-#[cfg(not(feature = "no_module"))]
-#[cfg(not(feature = "no_function"))]
-pub use script_fn::EncapsulatedEnviron;
 #[cfg(not(feature = "no_function"))]
 pub use script_fn::{ScriptFnDef, ScriptFnMetadata};
 pub use stmt::{

src/ast/script_fn.rs

@@ -7,34 +7,12 @@ use crate::{FnArgsVec, ImmutableString};
 use std::prelude::v1::*;
 use std::{fmt, hash::Hash};
 
-/// _(internals)_ Encapsulated AST environment.
-/// Exported under the `internals` feature only.
-///
-/// 1) other functions defined within the same AST
-/// 2) the stack of imported [modules][crate::Module]
-/// 3) global constants
-///
-/// Not available under `no_module` or `no_function`.
-#[cfg(not(feature = "no_module"))]
-#[derive(Debug, Clone)]
-pub struct EncapsulatedEnviron {
-    /// Functions defined within the same [`AST`][crate::AST].
-    pub lib: crate::SharedModule,
-    /// Imported [modules][crate::Module].
-    pub imports: Box<[(ImmutableString, crate::SharedModule)]>,
-    /// Globally-defined constants.
-    pub constants: Option<crate::eval::SharedGlobalConstants>,
-}
-
 /// _(internals)_ A type containing information on a script-defined function.
 /// Exported under the `internals` feature only.
 #[derive(Debug, Clone)]
 pub struct ScriptFnDef {
     /// Function body.
     pub body: StmtBlock,
-    /// Encapsulated AST environment, if any.
-    #[cfg(not(feature = "no_module"))]
-    pub environ: Option<crate::Shared<EncapsulatedEnviron>>,
     /// Function name.
     pub name: ImmutableString,
     /// Function access mode.