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 ... --- core/ops_builtin.rs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'core/ops_builtin.rs') diff --git a/core/ops_builtin.rs b/core/ops_builtin.rs index b00bb9c28..459b2a967 100644 --- a/core/ops_builtin.rs +++ b/core/ops_builtin.rs @@ -1,4 +1,3 @@ -use crate::error::bad_resource_id; use crate::error::type_error; use crate::error::AnyError; use crate::include_js_files; @@ -47,10 +46,7 @@ pub fn op_close( ) -> Result<(), AnyError> { // TODO(@AaronO): drop Option after improving type-strictness balance in serde_v8 let rid = rid.ok_or_else(|| type_error("missing or invalid `rid`"))?; - state - .resource_table - .close(rid) - .ok_or_else(bad_resource_id)?; + state.resource_table.close(rid)?; Ok(()) } -- cgit v1.2.3