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 /runtime/ops/tty.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 'runtime/ops/tty.rs')
| -rw-r--r-- | runtime/ops/tty.rs | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/runtime/ops/tty.rs b/runtime/ops/tty.rs index e9e2e6700..8295af1c7 100644 --- a/runtime/ops/tty.rs +++ b/runtime/ops/tty.rs @@ -89,10 +89,7 @@ fn op_set_raw( use winapi::shared::minwindef::FALSE; use winapi::um::{consoleapi, handleapi}; - let resource = state - .resource_table - .get::<StdFileResource>(rid) - .ok_or_else(bad_resource_id)?; + let resource = state.resource_table.get::<StdFileResource>(rid)?; if cbreak { return Err(not_supported()); @@ -156,10 +153,7 @@ fn op_set_raw( { use std::os::unix::io::AsRawFd; - let resource = state - .resource_table - .get::<StdFileResource>(rid) - .ok_or_else(bad_resource_id)?; + let resource = state.resource_table.get::<StdFileResource>(rid)?; if resource.fs_file.is_none() { return Err(not_supported()); |