From 6351c07bc6caecd2b7f232b057e8f4b7a2829b7f Mon Sep 17 00:00:00 2001
From: Stephen Chung <Stephen.Chung@intexact.com>
Date: Tue, 28 Apr 2020 19:39:28 +0800
Subject: [PATCH] Fix compiling for all features.

---
 src/packages/map_basic.rs   | 6 ++----
 src/packages/string_more.rs | 2 +-
 src/packages/time_basic.rs  | 4 ++--
 src/scope.rs                | 4 ++--
 tests/maps.rs               | 1 +
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/packages/map_basic.rs b/src/packages/map_basic.rs
index 44009e8a..40e2cec0 100644
--- a/src/packages/map_basic.rs
+++ b/src/packages/map_basic.rs
@@ -12,12 +12,10 @@ use crate::stdlib::{
 };
 
 fn map_get_keys(map: &mut Map) -> Vec<Dynamic> {
-    map.iter()
-        .map(|(k, _)| k.to_string().into())
-        .collect::<Vec<_>>()
+    map.iter().map(|(k, _)| k.to_string().into()).collect()
 }
 fn map_get_values(map: &mut Map) -> Vec<Dynamic> {
-    map.iter().map(|(_, v)| v.clone()).collect::<Vec<_>>()
+    map.iter().map(|(_, v)| v.clone()).collect()
 }
 
 #[cfg(not(feature = "no_object"))]
diff --git a/src/packages/string_more.rs b/src/packages/string_more.rs
index 4edef10e..0144792e 100644
--- a/src/packages/string_more.rs
+++ b/src/packages/string_more.rs
@@ -37,7 +37,7 @@ fn sub_string(s: &mut String, start: INT, len: INT) -> String {
         len as usize
     };
 
-    chars[offset..][..len].into_iter().collect::<String>()
+    chars[offset..][..len].into_iter().collect()
 }
 fn crop_string(s: &mut String, start: INT, len: INT) {
     let offset = if s.is_empty() || len <= 0 {
diff --git a/src/packages/time_basic.rs b/src/packages/time_basic.rs
index cb0c5f8e..173c3e22 100644
--- a/src/packages/time_basic.rs
+++ b/src/packages/time_basic.rs
@@ -87,10 +87,10 @@ def_package!(crate:BasicTimePackage:"Basic timing utilities.", lib, {
                 #[cfg(not(feature = "unchecked"))]
                 {
                     if seconds > (MAX_INT as u64) {
-                        return Err(EvalAltResult::ErrorArithmetic(
+                        return Err(Box::new(EvalAltResult::ErrorArithmetic(
                             format!("Integer overflow for timestamp.elapsed(): {}", seconds),
                             Position::none(),
-                        ));
+                        )));
                     }
                 }
                 return Ok(seconds as INT);
diff --git a/src/scope.rs b/src/scope.rs
index 2f6ca0c2..7bb40325 100644
--- a/src/scope.rs
+++ b/src/scope.rs
@@ -4,7 +4,7 @@ use crate::any::{Dynamic, Variant};
 use crate::parser::{map_dynamic_to_expr, Expr};
 use crate::token::Position;
 
-use crate::stdlib::{borrow::Cow, iter, vec::Vec};
+use crate::stdlib::{borrow::Cow, boxed::Box, iter, vec::Vec};
 
 /// Type of an entry in the Scope.
 #[derive(Debug, Eq, PartialEq, Hash, Copy, Clone)]
@@ -362,7 +362,7 @@ impl<'a> Scope<'a> {
     }
 
     /// Get an iterator to entries in the Scope.
-    pub fn iter(&self) -> impl Iterator<Item = &Entry> {
+    pub(crate) fn iter(&self) -> impl Iterator<Item = &Entry> {
         self.0.iter().rev() // Always search a Scope in reverse order
     }
 }
diff --git a/tests/maps.rs b/tests/maps.rs
index 897f8430..64c5a4c2 100644
--- a/tests/maps.rs
+++ b/tests/maps.rs
@@ -143,6 +143,7 @@ fn test_map_return() -> Result<(), Box<EvalAltResult>> {
 }
 
 #[test]
+#[cfg(not(feature = "no_index"))]
 fn test_map_for() -> Result<(), Box<EvalAltResult>> {
     let engine = Engine::new();