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 /ext/net/ops_tls.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 'ext/net/ops_tls.rs')
| -rw-r--r-- | ext/net/ops_tls.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ext/net/ops_tls.rs b/ext/net/ops_tls.rs index 14a135d7d..b89cc4005 100644 --- a/ext/net/ops_tls.rs +++ b/ext/net/ops_tls.rs @@ -11,7 +11,6 @@ use crate::DefaultTlsOptions; use crate::NetPermissions; use crate::UnsafelyIgnoreCertificateErrors; use deno_core::error::bad_resource; -use deno_core::error::bad_resource_id; use deno_core::error::custom_error; use deno_core::error::generic_error; use deno_core::error::invalid_hostname; @@ -717,8 +716,7 @@ where let resource_rc = state .borrow_mut() .resource_table - .take::<TcpStreamResource>(rid) - .ok_or_else(bad_resource_id)?; + .take::<TcpStreamResource>(rid)?; let resource = Rc::try_unwrap(resource_rc) .expect("Only a single use of this resource should happen"); let (read_half, write_half) = resource.into_inner(); @@ -1019,7 +1017,7 @@ async fn op_accept_tls( .borrow() .resource_table .get::<TlsListenerResource>(rid) - .ok_or_else(|| bad_resource("Listener has been closed"))?; + .map_err(|_| bad_resource("Listener has been closed"))?; let cancel_handle = RcRef::map(&resource, |r| &r.cancel_handle); let tcp_listener = RcRef::map(&resource, |r| &r.tcp_listener) |