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

Minor refactor.

Browse Source
This commit is contained in:
Stephen Chung
2022-01-03 23:16:47 +08:00
parent d60f14ec27
commit 1d1e473ac4
8 changed files with 34 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/func/call.rs
View File

@@ -155,7 +155,7 @@ impl Engine {
) -> String {
format!(
"{}{}{} ({})",
namespace.map_or(String::new(), |ns| ns.to_string()),
namespace.map_or_else(|| String::new(), |ns| ns.to_string()),
if namespace.is_some() {
Token::DoubleColon.literal_syntax()
} else {
@@ -372,14 +372,9 @@ impl Engine {
}
// Run external function
let source = if source.is_empty() {
if parent_source.is_empty() {
None
} else {
Some(parent_source.as_str())
}
} else {
Some(source.as_str())
let source = match (source.as_str(), parent_source.as_str()) {
("", "") => None,
("", s) | (s, _) => Some(s),
};
let context = (self, name, source, &*global, lib, pos).into();
@@ -424,10 +419,9 @@ impl Engine {
pos,
)
})?;
let source = if global.source.is_empty() {
None
} else {
Some(global.source.as_str())
let source = match global.source.as_str() {
"" => None,
s => Some(s),
};
(debug(&text, source, pos).into(), false)
} else {