Merge branch 'fix' into sapi

Author: danog

src/embed/mod.rs

@@ -272,7 +272,7 @@ mod tests {
     #[test]
     fn test_eval_bailout() {
         Embed::run(|| {
-            let result = Embed::eval("str_repeat('a', 100_000_000_000_000);");
+            let result = Embed::eval("trigger_error(\"Fatal error\", E_USER_ERROR);");
 
             assert!(result.is_err());
             assert!(result.unwrap_err().is_bailout());

src/flags.rs

@@ -391,10 +391,10 @@ impl Display for DataType {
 mod tests {
     use super::DataType;
     use crate::ffi::{
-        IS_ARRAY, IS_ARRAY_EX, IS_CALLABLE, IS_CONSTANT_AST, IS_CONSTANT_AST_EX, IS_DOUBLE,
-        IS_FALSE, IS_INDIRECT, IS_INTERNED_STRING_EX, IS_LONG, IS_NULL, IS_OBJECT, IS_OBJECT_EX,
-        IS_PTR, IS_REFERENCE, IS_REFERENCE_EX, IS_RESOURCE, IS_RESOURCE_EX, IS_STRING,
-        IS_STRING_EX, IS_TRUE, IS_UNDEF, IS_VOID,
+        IS_ARRAY, IS_ARRAY_EX, IS_CONSTANT_AST, IS_CONSTANT_AST_EX, IS_DOUBLE, IS_FALSE,
+        IS_INDIRECT, IS_INTERNED_STRING_EX, IS_LONG, IS_NULL, IS_OBJECT, IS_OBJECT_EX, IS_PTR,
+        IS_REFERENCE, IS_REFERENCE_EX, IS_RESOURCE, IS_RESOURCE_EX, IS_STRING, IS_STRING_EX,
+        IS_TRUE, IS_UNDEF, IS_VOID,
     };
     use std::convert::TryFrom;