kjuulh/rhai
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

Fix serde feature.

Browse Source
This commit is contained in:
Stephen Chung 2020-12-22 15:27:27 +08:00
parent 10da4d8976
commit 206400b187
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/fn_call.rs
View File

@ -178,6 +178,8 @@ impl Engine {
// Search for the native function // Search for the native function
// First search registered functions (can override packages) // First search registered functions (can override packages)
// Then search packages // Then search packages
// Finally search modules
//lib.get_fn(hash_fn, pub_only) //lib.get_fn(hash_fn, pub_only)
let f = self let f = self
.global_namespace .global_namespace
@ -211,17 +213,16 @@ impl Engine {
// See if the function match print/debug (which requires special processing) // See if the function match print/debug (which requires special processing)
return Ok(match fn_name { return Ok(match fn_name {
KEYWORD_PRINT => ( KEYWORD_PRINT => {
(self.print)(result.as_str().map_err(|typ| { let text = result.as_str().map_err(|typ| {
EvalAltResult::ErrorMismatchOutputType( EvalAltResult::ErrorMismatchOutputType(
self.map_type_name(type_name::<ImmutableString>()).into(), self.map_type_name(type_name::<ImmutableString>()).into(),
typ.into(), typ.into(),
pos, pos,
) )
})?) })?;
.into(), ((self.print)(text).into(), false)
false, }
),
KEYWORD_DEBUG => { KEYWORD_DEBUG => {
let text = result.as_str().map_err(|typ| { let text = result.as_str().map_err(|typ| {
EvalAltResult::ErrorMismatchOutputType( EvalAltResult::ErrorMismatchOutputType(

3
src/serde_impl/de.rs
View File

@ -3,7 +3,7 @@
use super::str::ImmutableStringDeserializer; use super::str::ImmutableStringDeserializer;
use crate::dynamic::Union; use crate::dynamic::Union;
use crate::stdlib::{any::type_name, boxed::Box, fmt, string::ToString}; use crate::stdlib::{any::type_name, boxed::Box, fmt, string::ToString};
use crate::{Dynamic, EvalAltResult, ImmutableString, LexError, ParseErrorType, Position}; use crate::{Dynamic, EvalAltResult, ImmutableString, LexError, Position};
use serde::de::{ use serde::de::{
DeserializeSeed, Deserializer, Error, IntoDeserializer, MapAccess, SeqAccess, Visitor, DeserializeSeed, Deserializer, Error, IntoDeserializer, MapAccess, SeqAccess, Visitor,
}; };
@ -122,7 +122,6 @@ impl Error for Box<EvalAltResult> {
LexError::ImproperSymbol("".to_string(), err.to_string()) LexError::ImproperSymbol("".to_string(), err.to_string())
.into_err(Position::NONE) .into_err(Position::NONE)
.into() .into()
.into()
} }
} }