Fix up tests and some coding style changes.

tests/build_type.rs

@@ -1,37 +1,38 @@
-use rhai::{CustomType, Engine, EvalAltResult, Position, TypeBuilder};
+#![cfg(not(feature = "no_object"))]
+use rhai::{CustomType, Engine, EvalAltResult, Position, TypeBuilder, INT};
 
 #[test]
 fn build_type() -> Result<(), Box<EvalAltResult>> {
     #[derive(Debug, Clone, PartialEq)]
     struct Vec3 {
-        x: i64,
-        y: i64,
-        z: i64,
+        x: INT,
+        y: INT,
+        z: INT,
     }
 
     impl Vec3 {
-        fn new(x: i64, y: i64, z: i64) -> Self {
+        fn new(x: INT, y: INT, z: INT) -> Self {
             Self { x, y, z }
         }
-        fn get_x(&mut self) -> i64 {
+        fn get_x(&mut self) -> INT {
             self.x
         }
-        fn set_x(&mut self, x: i64) {
+        fn set_x(&mut self, x: INT) {
             self.x = x
         }
-        fn get_y(&mut self) -> i64 {
+        fn get_y(&mut self) -> INT {
             self.y
         }
-        fn set_y(&mut self, y: i64) {
+        fn set_y(&mut self, y: INT) {
             self.y = y
         }
-        fn get_z(&mut self) -> i64 {
+        fn get_z(&mut self) -> INT {
             self.z
         }
-        fn set_z(&mut self, z: i64) {
+        fn set_z(&mut self, z: INT) {
             self.z = z
         }
-        fn get_component(&mut self, idx: i64) -> Result<i64, Box<EvalAltResult>> {
+        fn get_component(&mut self, idx: INT) -> Result<INT, Box<EvalAltResult>> {
             match idx {
                 0 => Ok(self.x),
                 1 => Ok(self.y),
@@ -51,8 +52,10 @@ fn build_type() -> Result<(), Box<EvalAltResult>> {
                 .with_fn("vec3", Self::new)
                 .with_get_set("x", Self::get_x, Self::set_x)
                 .with_get_set("y", Self::get_y, Self::set_y)
-                .with_get_set("z", Self::get_z, Self::set_z)
-                .with_indexer_get_result(Self::get_component);
+                .with_get_set("z", Self::get_z, Self::set_z);
+
+            #[cfg(not(feature = "no_index"))]
+            builder.with_indexer_get_result(Self::get_component);
         }
     }
 
@@ -61,55 +64,56 @@ fn build_type() -> Result<(), Box<EvalAltResult>> {
 
     assert_eq!(
         engine.eval::<Vec3>(
-            r#"
-        let v = vec3(1, 2, 3);
-        v
-"#,
+            "
+                let v = vec3(1, 2, 3);
+                v
+            ",
         )?,
         Vec3::new(1, 2, 3),
     );
     assert_eq!(
-        engine.eval::<i64>(
-            r#"
-        let v = vec3(1, 2, 3);
-        v.x
-"#,
+        engine.eval::<INT>(
+            "
+                let v = vec3(1, 2, 3);
+                v.x
+            ",
         )?,
         1,
     );
     assert_eq!(
-        engine.eval::<i64>(
-            r#"
-        let v = vec3(1, 2, 3);
-        v.y
-"#,
+        engine.eval::<INT>(
+            "
+                let v = vec3(1, 2, 3);
+                v.y
+            ",
         )?,
         2,
     );
     assert_eq!(
-        engine.eval::<i64>(
-            r#"
-        let v = vec3(1, 2, 3);
-        v.z
-"#,
+        engine.eval::<INT>(
+            "
+                let v = vec3(1, 2, 3);
+                v.z
+            ",
         )?,
         3,
     );
+    #[cfg(not(feature = "no_index"))]
     assert!(engine.eval::<bool>(
-        r#"
-        let v = vec3(1, 2, 3);
-        v.x == v[0] && v.y == v[1] && v.z == v[2]
-"#,
+        "
+            let v = vec3(1, 2, 3);
+            v.x == v[0] && v.y == v[1] && v.z == v[2]
+        ",
     )?);
     assert_eq!(
         engine.eval::<Vec3>(
-            r#"
-        let v = vec3(1, 2, 3);
-        v.x = 5;
-        v.y = 6;
-        v.z = 7;
-        v
-"#,
+            "
+                let v = vec3(1, 2, 3);
+                v.x = 5;
+                v.y = 6;
+                v.z = 7;
+                v
+            ",
         )?,
         Vec3::new(5, 6, 7),
     );