diff options
author | Bert Belder <bertbelder@gmail.com> | 2019-02-01 14:51:13 -0800 |
---|---|---|
committer | Bert Belder <bertbelder@gmail.com> | 2019-02-01 14:58:25 -0800 |
commit | e5899b14e268b6b636b04b8f5a78df4c23e00478 (patch) | |
tree | 78af8fc984c37fac52c1584d52222481b31b06fc /src | |
parent | 7d994c2e68e6383a52ce029d5a0b20281899dd02 (diff) |
src: simplify rust code
Diffstat (limited to 'src')
-rw-r--r-- | src/isolate.rs | 4 | ||||
-rw-r--r-- | src/tokio_util.rs | 2 |
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"), |