From 7ef3bd6b201a60edcf504b1c02d6148787b93c62 Mon Sep 17 00:00:00 2001
From: Stephen Chung <Stephen.Chung@intexact.com>
Date: Mon, 16 Nov 2020 23:25:19 +0800
Subject: [PATCH] Fix no_function build.

---
 src/fn_func.rs     | 2 +-
 src/fn_native.rs   | 6 +++---
 src/fn_register.rs | 3 ++-
 src/module/mod.rs  | 4 ++--
 src/parser.rs      | 8 ++++----
 src/plugin.rs      | 5 +++--
 6 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/fn_func.rs b/src/fn_func.rs
index dc72f3b7..0a52d478 100644
--- a/src/fn_func.rs
+++ b/src/fn_func.rs
@@ -4,8 +4,8 @@
 #![allow(non_snake_case)]
 
 use crate::dynamic::Variant;
-use crate::{Engine, EvalAltResult, ParseError, Scope, AST};
 use crate::stdlib::{boxed::Box, string::ToString};
+use crate::{Engine, EvalAltResult, ParseError, Scope, AST};
 
 /// Trait to create a Rust closure from a script.
 pub trait Func<ARGS, RET> {
diff --git a/src/fn_native.rs b/src/fn_native.rs
index c79b2e46..8b6734c7 100644
--- a/src/fn_native.rs
+++ b/src/fn_native.rs
@@ -1,13 +1,13 @@
 //! Module defining interfaces to native-Rust functions.
 
-use crate::ast::ScriptFnDef;
+use crate::ast::{FnAccess, ScriptFnDef};
 use crate::engine::Imports;
 use crate::plugin::PluginFunction;
 use crate::stdlib::{boxed::Box, convert::TryFrom, fmt, iter::empty, mem, string::String};
 use crate::token::is_valid_identifier;
 use crate::{
-    calc_script_fn_hash, Dynamic, Engine, EvalAltResult, EvalContext, FnAccess, ImmutableString,
-    Module, StaticVec, NO_POS,
+    calc_script_fn_hash, Dynamic, Engine, EvalAltResult, EvalContext, ImmutableString, Module,
+    StaticVec, NO_POS,
 };
 
 #[cfg(not(feature = "sync"))]
diff --git a/src/fn_register.rs b/src/fn_register.rs
index 07790a7f..a045466c 100644
--- a/src/fn_register.rs
+++ b/src/fn_register.rs
@@ -2,11 +2,12 @@
 
 #![allow(non_snake_case)]
 
+use crate::ast::FnAccess;
 use crate::dynamic::{DynamicWriteLock, Variant};
 use crate::fn_native::{CallableFunction, FnAny, FnCallArgs, SendSync};
 use crate::r#unsafe::unsafe_cast_box;
 use crate::stdlib::{any::TypeId, boxed::Box, mem, string::String};
-use crate::{Dynamic, Engine, EvalAltResult, FnAccess, ImmutableString, NativeCallContext};
+use crate::{Dynamic, Engine, EvalAltResult, ImmutableString, NativeCallContext};
 
 /// Trait to register custom functions with the `Engine`.
 pub trait RegisterFn<FN, ARGS, RET> {
diff --git a/src/module/mod.rs b/src/module/mod.rs
index 7c2fcc1d..16f5e98d 100644
--- a/src/module/mod.rs
+++ b/src/module/mod.rs
@@ -1,6 +1,6 @@
 //! Module defining external-loaded modules for Rhai.
 
-use crate::ast::IdentX;
+use crate::ast::{FnAccess, IdentX};
 use crate::dynamic::Variant;
 use crate::fn_native::{
     shared_make_mut, shared_take_or_clone, CallableFunction, FnCallArgs, IteratorFn, SendSync,
@@ -20,7 +20,7 @@ use crate::stdlib::{
 use crate::token::Token;
 use crate::utils::StraightHasherBuilder;
 use crate::{
-    Dynamic, EvalAltResult, FnAccess, ImmutableString, NativeCallContext, Shared, StaticVec, NO_POS,
+    Dynamic, EvalAltResult, ImmutableString, NativeCallContext, Shared, StaticVec, NO_POS,
 };
 
 #[cfg(not(feature = "no_index"))]
diff --git a/src/parser.rs b/src/parser.rs
index 5880a776..b5d8dc34 100644
--- a/src/parser.rs
+++ b/src/parser.rs
@@ -2370,9 +2370,9 @@ fn parse_stmt(
         Token::Fn | Token::Private => {
             let access = if matches!(token, Token::Private) {
                 eat_token(input, Token::Private);
-                crate::FnAccess::Private
+                crate::ast::FnAccess::Private
             } else {
-                crate::FnAccess::Public
+                crate::ast::FnAccess::Public
             };
 
             match input.next().unwrap() {
@@ -2553,7 +2553,7 @@ fn parse_fn(
     input: &mut TokenStream,
     state: &mut ParseState,
     lib: &mut FunctionsLib,
-    access: crate::FnAccess,
+    access: crate::ast::FnAccess,
     mut settings: ParseSettings,
 ) -> Result<ScriptFnDef, ParseError> {
     #[cfg(not(feature = "unchecked"))]
@@ -2788,7 +2788,7 @@ fn parse_anon_fn(
     // Define the function
     let script = ScriptFnDef {
         name: fn_name.clone(),
-        access: crate::FnAccess::Public,
+        access: crate::ast::FnAccess::Public,
         params,
         #[cfg(not(feature = "no_closure"))]
         externals: Default::default(),
diff --git a/src/plugin.rs b/src/plugin.rs
index 2f45629f..ca10fdae 100644
--- a/src/plugin.rs
+++ b/src/plugin.rs
@@ -1,10 +1,11 @@
 //! Module defining macros for developing _plugins_.
 
+pub use crate::ast::FnAccess;
 pub use crate::fn_native::{CallableFunction, FnCallArgs};
 pub use crate::stdlib::{any::TypeId, boxed::Box, format, mem, string::ToString, vec as new_vec};
 pub use crate::{
-    Dynamic, Engine, EvalAltResult, FnAccess, ImmutableString, Module, NativeCallContext,
-    RegisterFn, RegisterResultFn,
+    Dynamic, Engine, EvalAltResult, ImmutableString, Module, NativeCallContext, RegisterFn,
+    RegisterResultFn,
 };
 
 #[cfg(not(features = "no_module"))]