Map in operator to contains function call.

src/packages/array_basic.rs

@@ -237,11 +237,11 @@ mod array_functions {
     pub fn contains(
         ctx: NativeCallContext,
         array: &mut Array,
-        mut value: Dynamic,
+        value: Dynamic,
     ) -> Result<Dynamic, Box<EvalAltResult>> {
-        for item in array.iter() {
+        for item in array.iter_mut() {
             if ctx
-                .call_fn_dynamic_raw(OP_EQUALS, true, &mut [&mut value, &mut item.clone()])
+                .call_fn_dynamic_raw(OP_EQUALS, true, &mut [item, &mut value.clone()])
                 .or_else(|err| match *err {
                     EvalAltResult::ErrorFunctionNotFound(ref fn_sig, _)
                         if fn_sig.starts_with(OP_EQUALS) =>
@@ -268,11 +268,11 @@ mod array_functions {
     pub fn index_of(
         ctx: NativeCallContext,
         array: &mut Array,
-        mut value: Dynamic,
+        value: Dynamic,
     ) -> Result<Dynamic, Box<EvalAltResult>> {
-        for (i, item) in array.iter().enumerate() {
+        for (i, item) in array.iter_mut().enumerate() {
             if ctx
-                .call_fn_dynamic_raw(OP_EQUALS, true, &mut [&mut value, &mut item.clone()])
+                .call_fn_dynamic_raw(OP_EQUALS, true, &mut [item, &mut value.clone()])
                 .or_else(|err| match *err {
                     EvalAltResult::ErrorFunctionNotFound(ref fn_sig, _)
                         if fn_sig.starts_with(OP_EQUALS) =>

src/packages/map_basic.rs

@@ -13,8 +13,8 @@ def_package!(crate:BasicMapPackage:"Basic object map utilities.", lib, {
 
 #[export_module]
 mod map_functions {
-    #[rhai_fn(pure)]
-    pub fn has(map: &mut Map, prop: ImmutableString) -> bool {
+    #[rhai_fn(name = "has", pure)]
+    pub fn contains(map: &mut Map, prop: ImmutableString) -> bool {
         map.contains_key(&prop)
     }
     #[rhai_fn(pure)]

src/packages/string_more.rs

@@ -74,14 +74,6 @@ mod string_functions {
         }
     }
 
-    #[rhai_fn(name = "contains")]
-    pub fn contains_char(string: &str, character: char) -> bool {
-        string.contains(character)
-    }
-    pub fn contains(string: &str, find_string: &str) -> bool {
-        string.contains(find_string)
-    }
-
     #[rhai_fn(name = "index_of")]
     pub fn index_of_char_starting_from(string: &str, character: char, start: INT) -> INT {
         let start = if start < 0 {