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

Simplify using ..

Browse Source
This commit is contained in:
Stephen Chung
2022-02-08 09:02:15 +08:00
parent 187a20fd8b
commit f8cee0fe4e
54 changed files with 1184 additions and 1190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/func/script.rs
View File

@@ -103,7 +103,7 @@ impl Engine {
scope
.iter()
.skip(orig_scope_len)
.map(|(_, _, v)| v.clone())
.map(|(.., v)| v.clone())
.collect(),
global.source.clone(),
pos,
@@ -161,9 +161,9 @@ impl Engine {
)
.or_else(|err| match *err {
// Convert return statement to return value
ERR::Return(x, _) => Ok(x),
ERR::Return(x, ..) => Ok(x),
// Error in sub function call
ERR::ErrorInFunctionCall(name, src, err, _) => {
ERR::ErrorInFunctionCall(name, src, err, ..) => {
let fn_name = if src.is_empty() {
format!("{} < {}", name, fn_def.name)
} else {
@@ -185,7 +185,7 @@ impl Engine {
{
let trigger = match global.debugger.status {
crate::eval::DebuggerStatus::FunctionExit(n) => n >= level,
crate::eval::DebuggerStatus::Next(_, true) => true,
crate::eval::DebuggerStatus::Next(.., true) => true,
_ => false,
};
if trigger {