diff options
author | Bert Belder <bertbelder@gmail.com> | 2019-01-15 13:06:25 +0100 |
---|---|---|
committer | Ryan Dahl <ry@tinyclouds.org> | 2019-01-15 07:06:25 -0500 |
commit | d8adeb41de2daab15a0d30eeead9796fa58bfbc3 (patch) | |
tree | 030670147587a2ebc04506a3dcad7bd34bce1016 /src/isolate.rs | |
parent | 48ca06e420d08d15ac6653ab73c6249eb99428a7 (diff) |
Clippy fixes (also fixes build with nightly) (#1527)
Diffstat (limited to 'src/isolate.rs')
-rw-r--r-- | src/isolate.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/isolate.rs b/src/isolate.rs index b0bd085de..9c9e7dd4f 100644 --- a/src/isolate.rs +++ b/src/isolate.rs @@ -89,7 +89,7 @@ impl IsolateState { permissions: DenoPermissions::new(&flags), flags, metrics: Metrics::default(), - worker_channels: worker_channels.map(|wc| Mutex::new(wc)), + worker_channels: worker_channels.map(Mutex::new), } } @@ -212,7 +212,7 @@ impl Isolate { pub fn last_exception(&self) -> Option<JSError> { let ptr = unsafe { libdeno::deno_last_exception(self.libdeno_isolate) }; - if ptr == std::ptr::null() { + if ptr.is_null() { None } else { let cstr = unsafe { CStr::from_ptr(ptr) }; @@ -220,7 +220,7 @@ impl Isolate { debug!("v8_exception\n{}\n", v8_exception); let js_error = JSError::from_v8_exception(v8_exception).unwrap(); let js_error_mapped = js_error.apply_source_map(&self.state.dir); - return Some(js_error_mapped); + Some(js_error_mapped) } } |