summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRyan Dahl <ry@tinyclouds.org>2019-02-01 19:46:54 -0500
committerRyan Dahl <ry@tinyclouds.org>2019-02-02 16:46:31 -0500
commit1770a77bca32a852892292406407ae52a0e29992 (patch)
tree2bcb94c50957e822b3200749f3a2396533c84efd /src
parent0b082c4361c63768e5b8610cb22ad7c79e9214aa (diff)
Clean up return value of deno_execute
and deno_respond
Diffstat (limited to 'src')
-rw-r--r--src/isolate.rs7
-rw-r--r--src/libdeno.rs2
2 files changed, 4 insertions, 5 deletions
diff --git a/src/isolate.rs b/src/isolate.rs
index 0f64d5ab4..e0a657ff2 100644
--- a/src/isolate.rs
+++ b/src/isolate.rs
@@ -251,7 +251,7 @@ impl Isolate {
) -> Result<(), JSError> {
let filename = CString::new(js_filename).unwrap();
let source = CString::new(js_source).unwrap();
- let r = unsafe {
+ unsafe {
libdeno::deno_execute(
self.libdeno_isolate,
self.as_raw_ptr(),
@@ -259,9 +259,8 @@ impl Isolate {
source.as_ptr(),
)
};
- if r == 0 {
- let js_error = self.last_exception().unwrap();
- return Err(js_error);
+ if let Some(err) = self.last_exception() {
+ return Err(err);
}
Ok(())
}
diff --git a/src/libdeno.rs b/src/libdeno.rs
index ac1655bb3..ddf025aba 100644
--- a/src/libdeno.rs
+++ b/src/libdeno.rs
@@ -148,7 +148,7 @@ extern "C" {
user_data: *const c_void,
js_filename: *const c_char,
js_source: *const c_char,
- ) -> c_int;
+ );
// Modules