summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/isolate.rs4
-rw-r--r--src/tokio_util.rs2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/isolate.rs b/src/isolate.rs
index 39136daff..0f64d5ab4 100644
--- a/src/isolate.rs
+++ b/src/isolate.rs
@@ -335,7 +335,7 @@ impl Isolate {
) -> Result<(), RustOrJsError> {
// basically iterate over the imports, start loading them.
- let referrer = self.modules.get(&id).unwrap().clone();
+ let referrer = &self.modules[&id];
let referrer_name = referrer.name.clone();
let len =
unsafe { libdeno::deno_mod_imports_len(self.libdeno_isolate, id) };
@@ -532,7 +532,7 @@ extern "C" fn resolve_cb(
let isolate = unsafe { Isolate::from_raw_ptr(user_data) };
let specifier_c: &CStr = unsafe { CStr::from_ptr(specifier_ptr) };
let specifier: &str = specifier_c.to_str().unwrap();
- return isolate.resolve_cb(specifier, referrer);
+ isolate.resolve_cb(specifier, referrer)
}
// Dereferences the C pointer into the Rust Isolate object.
diff --git a/src/tokio_util.rs b/src/tokio_util.rs
index 2eb0211db..5322f2955 100644
--- a/src/tokio_util.rs
+++ b/src/tokio_util.rs
@@ -79,7 +79,7 @@ impl Future for Accept {
}
Err(e) => {
r.untrack_task();
- return Err(From::from(e));
+ return Err(e);
}
},
AcceptState::Empty => panic!("poll Accept after it's done"),