Merge branch 'master' into plugins

src/fn_native.rs

@@ -28,13 +28,9 @@ pub type Shared<T> = Arc<T>;
 /// If the resource is shared (i.e. has other outstanding references), a cloned copy is used.
 pub fn shared_make_mut<T: Clone>(value: &mut Shared<T>) -> &mut T {
     #[cfg(not(feature = "sync"))]
-    {
-        Rc::make_mut(value)
-    }
+    return Rc::make_mut(value);
     #[cfg(feature = "sync")]
-    {
-        Arc::make_mut(value)
-    }
+    return Arc::make_mut(value);
 }
 
 /// Consume a `Shared` resource, assuming that it is unique (i.e. not shared).
@@ -44,13 +40,9 @@ pub fn shared_make_mut<T: Clone>(value: &mut Shared<T>) -> &mut T {
 /// Panics if the resource is shared (i.e. has other outstanding references).
 pub fn shared_take<T: Clone>(value: Shared<T>) -> T {
     #[cfg(not(feature = "sync"))]
-    {
-        Rc::try_unwrap(value).map_err(|_| ()).unwrap()
-    }
+    return Rc::try_unwrap(value).map_err(|_| ()).unwrap();
     #[cfg(feature = "sync")]
-    {
-        Arc::try_unwrap(value).map_err(|_| ()).unwrap()
-    }
+    return Arc::try_unwrap(value).map_err(|_| ()).unwrap();
 }
 
 pub type FnCallArgs<'a> = [&'a mut Dynamic];
@@ -122,6 +114,7 @@ pub enum CallableFunction {
     /// A plugin-defined function,
     Plugin(SharedPluginFunction),
     /// A script-defined function.
+    #[cfg(not(feature = "no_function"))]
     Script(Shared<ScriptFnDef>),
 }
 
@@ -132,6 +125,8 @@ impl fmt::Debug for CallableFunction {
             Self::Method(_) => write!(f, "NativeMethod"),
             Self::Iterator(_) => write!(f, "NativeIterator"),
             Self::Plugin(_) => write!(f, "PluginFunction"),
+
+            #[cfg(not(feature = "no_function"))]
             Self::Script(fn_def) => fmt::Debug::fmt(fn_def, f),
         }
     }
@@ -144,6 +139,8 @@ impl fmt::Display for CallableFunction {
             Self::Method(_) => write!(f, "NativeMethod"),
             Self::Iterator(_) => write!(f, "NativeIterator"),
             Self::Plugin(_) => write!(f, "PluginFunction"),
+
+            #[cfg(not(feature = "no_function"))]
             CallableFunction::Script(s) => fmt::Display::fmt(s, f),
         }
     }
@@ -154,24 +151,34 @@ impl CallableFunction {
     pub fn is_pure(&self) -> bool {
         match self {
             Self::Pure(_) => true,
-            Self::Method(_) | Self::Iterator(_) | Self::Script(_) | Self::Plugin(_) => false,
+            Self::Method(_) | Self::Iterator(_) | Self::Plugin(_) => false,
+
+            #[cfg(not(feature = "no_function"))]
+            Self::Script(_) => false,
         }
     }
     /// Is this a native Rust method function?
     pub fn is_method(&self) -> bool {
         match self {
             Self::Method(_) => true,
-            Self::Pure(_) | Self::Iterator(_) | Self::Script(_) | Self::Plugin(_) => false,
+            Self::Pure(_) | Self::Iterator(_) | Self::Plugin(_) => false,
+
+            #[cfg(not(feature = "no_function"))]
+            Self::Script(_) => false,
         }
     }
     /// Is this an iterator function?
     pub fn is_iter(&self) -> bool {
         match self {
             Self::Iterator(_) => true,
-            Self::Pure(_) | Self::Method(_) | Self::Script(_) | Self::Plugin(_) => false,
+            Self::Pure(_) | Self::Method(_) | Self::Plugin(_) => false,
+
+            #[cfg(not(feature = "no_function"))]
+            Self::Script(_) => false,
         }
     }
     /// Is this a Rhai-scripted function?
+    #[cfg(not(feature = "no_function"))]
     pub fn is_script(&self) -> bool {
         match self {
             Self::Script(_) => true,
@@ -193,7 +200,10 @@ impl CallableFunction {
     pub fn get_native_fn(&self) -> &FnAny {
         match self {
             Self::Pure(f) | Self::Method(f) => f.as_ref(),
-            Self::Iterator(_) | Self::Script(_) | Self::Plugin(_) => unreachable!(),
+            Self::Iterator(_) | Self::Plugin(_) => unreachable!(),
+
+            #[cfg(not(feature = "no_function"))]
+            Self::Script(_) => unreachable!(),
         }
     }
     /// Get a shared reference to a script-defined function definition.
@@ -201,6 +211,7 @@ impl CallableFunction {
     /// # Panics
     ///
     /// Panics if the `CallableFunction` is not `Script`.
+    #[cfg(not(feature = "no_function"))]
     pub fn get_shared_fn_def(&self) -> Shared<ScriptFnDef> {
         match self {
             Self::Pure(_) | Self::Method(_) | Self::Iterator(_) | Self::Plugin(_) => unreachable!(),
@@ -212,6 +223,7 @@ impl CallableFunction {
     /// # Panics
     ///
     /// Panics if the `CallableFunction` is not `Script`.
+    #[cfg(not(feature = "no_function"))]
     pub fn get_fn_def(&self) -> &ScriptFnDef {
         match self {
             Self::Pure(_) | Self::Method(_) | Self::Iterator(_) | Self::Plugin(_) => unreachable!(),
@@ -226,7 +238,10 @@ impl CallableFunction {
     pub fn get_iter_fn(&self) -> IteratorFn {
         match self {
             Self::Iterator(f) => *f,
-            Self::Pure(_) | Self::Method(_) | Self::Script(_) | Self::Plugin(_) => unreachable!(),
+            Self::Pure(_) | Self::Method(_) | Self::Plugin(_) => unreachable!(),
+
+            #[cfg(not(feature = "no_function"))]
+            Self::Script(_) => unreachable!(),
         }
     }
     /// Get a reference to a plugin function.
@@ -237,7 +252,10 @@ impl CallableFunction {
     pub fn get_plugin_fn<'s>(&'s self) -> SharedPluginFunction {
         match self {
             Self::Plugin(f) => f.clone(),
-            Self::Pure(_) | Self::Method(_) | Self::Script(_) | Self::Iterator(_) => unreachable!(),
+            Self::Pure(_) | Self::Method(_) | Self::Iterator(_) => unreachable!(),
+
+            #[cfg(not(feature = "no_function"))]
+            Self::Script(_) => unreachable!(),
         }
     }
     /// Create a new `CallableFunction::Pure`.
@@ -268,12 +286,14 @@ impl From<IteratorFn> for CallableFunction {
     }
 }
 
+#[cfg(not(feature = "no_function"))]
 impl From<ScriptFnDef> for CallableFunction {
     fn from(func: ScriptFnDef) -> Self {
         Self::Script(func.into())
     }
 }
 
+#[cfg(not(feature = "no_function"))]
 impl From<Shared<ScriptFnDef>> for CallableFunction {
     fn from(func: Shared<ScriptFnDef>) -> Self {
         Self::Script(func)