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

Fix builds.

Browse Source
This commit is contained in:
Stephen Chung 2020-11-12 23:09:27 +08:00
parent 69a0f044f4
commit 27619b86db
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dynamic.rs
View File

@ -388,7 +388,7 @@ impl Hash for Dynamic {
Union::Shared(cell) => (*cell.borrow()).hash(state), Union::Shared(cell) => (*cell.borrow()).hash(state),
#[cfg(not(feature = "no_closure"))] #[cfg(not(feature = "no_closure"))]
#[cfg(feature = "sync")] #[cfg(feature = "sync")]
Union::Shared(cell) => (*cell.read().unwrap()).hash(hasher), Union::Shared(cell) => (*cell.read().unwrap()).hash(state),
_ => unimplemented!(), _ => unimplemented!(),
} }

6
src/parser.rs
View File

@ -13,7 +13,7 @@ use crate::syntax::CustomSyntax;
use crate::token::{ use crate::token::{
is_keyword_function, is_valid_identifier, Position, Token, TokenStream, NO_POS, is_keyword_function, is_valid_identifier, Position, Token, TokenStream, NO_POS,
}; };
use crate::utils::StraightHasherBuilder; use crate::utils::{ImmutableString, StraightHasherBuilder};
use crate::{calc_script_fn_hash, StaticVec}; use crate::{calc_script_fn_hash, StaticVec};
#[cfg(not(feature = "no_float"))] #[cfg(not(feature = "no_float"))]
@ -26,7 +26,6 @@ use crate::engine::{make_getter, make_setter, KEYWORD_EVAL, KEYWORD_FN_PTR};
use crate::{ use crate::{
ast::FnAccess, ast::FnAccess,
engine::{FN_ANONYMOUS, KEYWORD_FN_PTR_CURRY}, engine::{FN_ANONYMOUS, KEYWORD_FN_PTR_CURRY},
utils::ImmutableString,
}; };
use crate::stdlib::{ use crate::stdlib::{
@ -169,6 +168,7 @@ impl<'e> ParseState<'e> {
/// Get an interned string, creating one if it is not yet interned. /// Get an interned string, creating one if it is not yet interned.
pub fn get_interned_string(&mut self, text: String) -> ImmutableString { pub fn get_interned_string(&mut self, text: String) -> ImmutableString {
#[allow(clippy::map_entry)]
if !self.strings.contains_key(&text) { if !self.strings.contains_key(&text) {
let value: ImmutableString = text.clone().into(); let value: ImmutableString = text.clone().into();
let result = value.clone(); let result = value.clone();
@ -2555,7 +2555,7 @@ fn make_curry_from_externals(fn_expr: Expr, externals: StaticVec<Ident>, pos: Po
#[cfg(feature = "no_closure")] #[cfg(feature = "no_closure")]
externals.into_iter().for_each(|x| { externals.into_iter().for_each(|x| {
args.push(Expr::Variable(Box::new((None, None, 0, x.clone())))); args.push(Expr::Variable(Box::new((None, None, 0, x.clone().into()))));
}); });
let hash = calc_script_fn_hash(empty(), KEYWORD_FN_PTR_CURRY, num_externals + 1); let hash = calc_script_fn_hash(empty(), KEYWORD_FN_PTR_CURRY, num_externals + 1);