summaryrefslogtreecommitdiff
path: root/core/ops_builtin.rs
diff options
context:
space:
mode:
authorAaron O'Mullan <aaron.omullan@gmail.com>2021-08-15 13:29:19 +0200
committerGitHub <noreply@github.com>2021-08-15 13:29:19 +0200
commit2ca454b402d48c1808f8233c5adedc11b714c63c (patch)
tree592f9e877e9b0ae92be80383ab723cc290e4b01e /core/ops_builtin.rs
parent18ff6bb053d600c277613628a256fe5fdd4dda67 (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 'core/ops_builtin.rs')
-rw-r--r--core/ops_builtin.rs6
1 files changed, 1 insertions, 5 deletions
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(())
}