diff options
| author | Aaron O'Mullan <aaron.omullan@gmail.com> | 2021-08-15 13:29:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-15 13:29:19 +0200 |
| commit | 2ca454b402d48c1808f8233c5adedc11b714c63c (patch) | |
| tree | 592f9e877e9b0ae92be80383ab723cc290e4b01e /runtime/ops/signal.rs | |
| parent | 18ff6bb053d600c277613628a256fe5fdd4dda67 (diff) | |
refactor(ops): return BadResource errors in ResourceTable calls (#11710)
* refactor(ops): return BadResource errors in ResourceTable calls
Instead of relying on callers to map Options to Results via `.ok_or_else(bad_resource_id)` at over 176 different call sites ...
Diffstat (limited to 'runtime/ops/signal.rs')
| -rw-r--r-- | runtime/ops/signal.rs | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/runtime/ops/signal.rs b/runtime/ops/signal.rs index ed9c9797e..889021706 100644 --- a/runtime/ops/signal.rs +++ b/runtime/ops/signal.rs @@ -8,8 +8,6 @@ use std::cell::RefCell; use std::rc::Rc; #[cfg(unix)] -use deno_core::error::bad_resource_id; -#[cfg(unix)] use deno_core::AsyncRefCell; #[cfg(unix)] use deno_core::CancelFuture; @@ -81,8 +79,7 @@ async fn op_signal_poll( let resource = state .borrow_mut() .resource_table - .get::<SignalStreamResource>(rid) - .ok_or_else(bad_resource_id)?; + .get::<SignalStreamResource>(rid)?; let cancel = RcRef::map(&resource, |r| &r.cancel); let mut signal = RcRef::map(&resource, |r| &r.signal).borrow_mut().await; @@ -99,10 +96,7 @@ pub fn op_signal_unbind( _: (), ) -> Result<(), AnyError> { super::check_unstable(state, "Deno.signal"); - state - .resource_table - .close(rid) - .ok_or_else(bad_resource_id)?; + state.resource_table.close(rid)?; Ok(()) } |
