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/fs.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/fs.rs')
| -rw-r--r-- | runtime/ops/fs.rs | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/runtime/ops/fs.rs b/runtime/ops/fs.rs index c7f4295ba..419e41718 100644 --- a/runtime/ops/fs.rs +++ b/runtime/ops/fs.rs @@ -230,8 +230,7 @@ async fn op_seek_async( let resource = state .borrow_mut() .resource_table - .get::<StdFileResource>(rid) - .ok_or_else(bad_resource_id)?; + .get::<StdFileResource>(rid)?; if resource.fs_file.is_none() { return Err(bad_resource_id()); @@ -265,8 +264,7 @@ async fn op_fdatasync_async( let resource = state .borrow_mut() .resource_table - .get::<StdFileResource>(rid) - .ok_or_else(bad_resource_id)?; + .get::<StdFileResource>(rid)?; if resource.fs_file.is_none() { return Err(bad_resource_id()); @@ -300,8 +298,7 @@ async fn op_fsync_async( let resource = state .borrow_mut() .resource_table - .get::<StdFileResource>(rid) - .ok_or_else(bad_resource_id)?; + .get::<StdFileResource>(rid)?; if resource.fs_file.is_none() { return Err(bad_resource_id()); @@ -335,8 +332,7 @@ async fn op_fstat_async( let resource = state .borrow_mut() .resource_table - .get::<StdFileResource>(rid) - .ok_or_else(bad_resource_id)?; + .get::<StdFileResource>(rid)?; if resource.fs_file.is_none() { return Err(bad_resource_id()); @@ -1298,8 +1294,7 @@ async fn op_ftruncate_async( let resource = state .borrow_mut() .resource_table - .get::<StdFileResource>(rid) - .ok_or_else(bad_resource_id)?; + .get::<StdFileResource>(rid)?; if resource.fs_file.is_none() { return Err(bad_resource_id()); @@ -1580,8 +1575,7 @@ async fn op_futime_async( let resource = state .borrow_mut() .resource_table - .get::<StdFileResource>(rid) - .ok_or_else(bad_resource_id)?; + .get::<StdFileResource>(rid)?; if resource.fs_file.is_none() { return Err(bad_resource_id()); |