From 2ca454b402d48c1808f8233c5adedc11b714c63c Mon Sep 17 00:00:00 2001 From: Aaron O'Mullan Date: Sun, 15 Aug 2021 13:29:19 +0200 Subject: 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 ... --- runtime/ops/signal.rs | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'runtime/ops/signal.rs') 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 @@ -7,8 +7,6 @@ use deno_core::OpState; 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)] @@ -81,8 +79,7 @@ async fn op_signal_poll( let resource = state .borrow_mut() .resource_table - .get::(rid) - .ok_or_else(bad_resource_id)?; + .get::(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(()) } -- cgit v1.2.3