Fix builds.
This commit is contained in:
parent
6b8ddd925b
commit
6f4cc91451
@ -1,7 +1,11 @@
|
|||||||
//! Module that defines JSON manipulation functions for [`Engine`].
|
//! Module that defines JSON manipulation functions for [`Engine`].
|
||||||
#![cfg(not(feature = "no_object"))]
|
#![cfg(not(feature = "no_object"))]
|
||||||
|
|
||||||
use crate::{Engine, LexError, Map, OptimizationLevel, ParseState, RhaiResultOf, Scope, Token};
|
use crate::parser::ParseState;
|
||||||
|
use crate::tokenizer::Token;
|
||||||
|
use crate::{Engine, LexError, Map, OptimizationLevel, RhaiResultOf, Scope};
|
||||||
|
#[cfg(feature = "no_std")]
|
||||||
|
use std::prelude::v1::*;
|
||||||
|
|
||||||
impl Engine {
|
impl Engine {
|
||||||
/// Parse a JSON string into an [object map][Map].
|
/// Parse a JSON string into an [object map][Map].
|
||||||
@ -53,8 +57,7 @@ impl Engine {
|
|||||||
/// # Ok(())
|
/// # Ok(())
|
||||||
/// # }
|
/// # }
|
||||||
/// ```
|
/// ```
|
||||||
#[cfg(not(feature = "no_object"))]
|
#[inline]
|
||||||
#[inline(always)]
|
|
||||||
pub fn parse_json(&self, json: impl AsRef<str>, has_null: bool) -> RhaiResultOf<Map> {
|
pub fn parse_json(&self, json: impl AsRef<str>, has_null: bool) -> RhaiResultOf<Map> {
|
||||||
let scripts = [json.as_ref()];
|
let scripts = [json.as_ref()];
|
||||||
|
|
||||||
@ -134,6 +137,8 @@ impl Engine {
|
|||||||
|
|
||||||
/// Return the JSON representation of an [object map][Map].
|
/// Return the JSON representation of an [object map][Map].
|
||||||
///
|
///
|
||||||
|
/// Not available under `no_std`.
|
||||||
|
///
|
||||||
/// This function can be used together with [`Engine::parse_json`] to work with JSON texts
|
/// This function can be used together with [`Engine::parse_json`] to work with JSON texts
|
||||||
/// without using the [`serde`](https://crates.io/crates/serde) crate (which is heavy).
|
/// without using the [`serde`](https://crates.io/crates/serde) crate (which is heavy).
|
||||||
///
|
///
|
||||||
@ -146,6 +151,7 @@ impl Engine {
|
|||||||
/// # Errors
|
/// # Errors
|
||||||
///
|
///
|
||||||
/// Data types not supported by JSON serialize into formats that may invalidate the result.
|
/// Data types not supported by JSON serialize into formats that may invalidate the result.
|
||||||
|
#[inline]
|
||||||
pub fn format_map_as_json(map: &Map) -> String {
|
pub fn format_map_as_json(map: &Map) -> String {
|
||||||
let mut result = String::from('{');
|
let mut result = String::from('{');
|
||||||
|
|
||||||
|
@ -112,6 +112,7 @@ fn test_options_strict_var() -> Result<(), Box<EvalAltResult>> {
|
|||||||
engine.compile("let x = 42; let f = |y| { || x + y };")?;
|
engine.compile("let x = 42; let f = |y| { || x + y };")?;
|
||||||
assert!(engine.compile("fn foo() { |y| { || x + y } }").is_err());
|
assert!(engine.compile("fn foo() { |y| { || x + y } }").is_err());
|
||||||
}
|
}
|
||||||
|
#[cfg(not(feature = "no_optimize"))]
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
engine.eval_with_scope::<INT>(&mut scope, "fn foo(z) { x * y + z } foo(1)")?,
|
engine.eval_with_scope::<INT>(&mut scope, "fn foo(z) { x * y + z } foo(1)")?,
|
||||||
1
|
1
|
||||||
|
Loading…
Reference in New Issue
Block a user