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_unix.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_unix.rs')
| -rw-r--r-- | ext/net/ops_unix.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/net/ops_unix.rs b/ext/net/ops_unix.rs index 9dfcc231e..c39252fbf 100644 --- a/ext/net/ops_unix.rs +++ b/ext/net/ops_unix.rs @@ -87,7 +87,7 @@ pub(crate) async fn accept_unix( .borrow() .resource_table .get::<UnixListenerResource>(rid) - .ok_or_else(|| bad_resource("Listener has been closed"))?; + .map_err(|_| bad_resource("Listener has been closed"))?; let listener = RcRef::map(&resource, |r| &r.listener) .try_borrow_mut() .ok_or_else(|| custom_error("Busy", "Listener already in use"))?; @@ -124,7 +124,7 @@ pub(crate) async fn receive_unix_packet( .borrow() .resource_table .get::<UnixDatagramResource>(rid) - .ok_or_else(|| bad_resource("Socket has been closed"))?; + .map_err(|_| bad_resource("Socket has been closed"))?; let socket = RcRef::map(&resource, |r| &r.socket) .try_borrow_mut() .ok_or_else(|| custom_error("Busy", "Socket already in use"))?; |