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

Simplify.

Browse Source
This commit is contained in:
Stephen Chung 2020-03-26 10:55:50 +08:00
parent a5a161ec88
commit 6308e54119
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/builtin.rs
View File

@ -621,10 +621,6 @@ impl Engine<'_> {
}); });
} }
fn range<T>(from: T, to: T) -> Range<T> {
from..to
}
reg_iterator::<INT>(self); reg_iterator::<INT>(self);
self.register_fn("range", |i1: INT, i2: INT| (i1..i2)); self.register_fn("range", |i1: INT, i2: INT| (i1..i2));
@ -632,15 +628,15 @@ impl Engine<'_> {
#[cfg(not(feature = "only_i64"))] #[cfg(not(feature = "only_i64"))]
{ {
macro_rules! reg_range { macro_rules! reg_range {
($self:expr, $x:expr, $op:expr, $( $y:ty ),*) => ( ($self:expr, $x:expr, $( $y:ty ),*) => (
$( $(
reg_iterator::<$y>(self); reg_iterator::<$y>(self);
$self.register_fn($x, $op as fn(x: $y, y: $y)->Range<$y>); $self.register_fn($x, (|x: $y, y: $y| x..y) as fn(x: $y, y: $y)->Range<$y>);
)* )*
) )
} }
reg_range!(self, "range", range, i8, u8, i16, u16, i32, i64, u32, u64); reg_range!(self, "range", i8, u8, i16, u16, i32, i64, u32, u64);
} }
} }
} }
@ -889,9 +885,7 @@ impl Engine<'_> {
let trimmed = s.trim(); let trimmed = s.trim();
if trimmed.len() < s.len() { if trimmed.len() < s.len() {
let chars: Vec<_> = trimmed.chars().collect(); *s = trimmed.to_string();
s.clear();
chars.iter().for_each(|&ch| s.push(ch));
} }
}); });
} }