refactor: remove OpError, use ErrBox everywhere (#7187)

Co-authored-by: Bartek Iwańczuk <biwanczuk@gmail.com>

1 files changed, 22 insertions, 7 deletions

diff --git a/cli/ops/permissions.rs b/cli/ops/permissions.rs
index 4cb998536..6ebabfa5c 100644
--- a/cli/ops/permissions.rs
+++ b/cli/ops/permissions.rs
@@ -1,8 +1,8 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
 use super::dispatch_json::{Deserialize, JsonOp, Value};
-use crate::op_error::OpError;
 use crate::state::State;
 use deno_core::CoreIsolate;
+use deno_core::ErrBox;
 use deno_core::ZeroCopyBuf;
 use std::path::Path;
 use std::rc::Rc;
@@ -33,7 +33,7 @@ pub fn op_query_permission(
   state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
-) -> Result<JsonOp, OpError> {
+) -> Result<JsonOp, ErrBox> {
   let args: PermissionArgs = serde_json::from_value(args)?;
   let permissions = state.permissions.borrow();
   let path = args.path.as_deref();
@@ -45,7 +45,12 @@ pub fn op_query_permission(
     "run" => permissions.query_run(),
     "plugin" => permissions.query_plugin(),
     "hrtime" => permissions.query_hrtime(),
-    n => return Err(OpError::other(format!("No such permission name: {}", n))),
+    n => {
+      return Err(ErrBox::new(
+        "ReferenceError",
+        format!("No such permission name: {}", n),
+      ))
+    }
   };
   Ok(JsonOp::Sync(json!({ "state": perm.to_string() })))
 }
@@ -54,7 +59,7 @@ pub fn op_revoke_permission(
   state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
-) -> Result<JsonOp, OpError> {
+) -> Result<JsonOp, ErrBox> {
   let args: PermissionArgs = serde_json::from_value(args)?;
   let mut permissions = state.permissions.borrow_mut();
   let path = args.path.as_deref();
@@ -66,7 +71,12 @@ pub fn op_revoke_permission(
     "run" => permissions.revoke_run(),
     "plugin" => permissions.revoke_plugin(),
     "hrtime" => permissions.revoke_hrtime(),
-    n => return Err(OpError::other(format!("No such permission name: {}", n))),
+    n => {
+      return Err(ErrBox::new(
+        "ReferenceError",
+        format!("No such permission name: {}", n),
+      ))
+    }
   };
   Ok(JsonOp::Sync(json!({ "state": perm.to_string() })))
 }
@@ -75,7 +85,7 @@ pub fn op_request_permission(
   state: &Rc<State>,
   args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
-) -> Result<JsonOp, OpError> {
+) -> Result<JsonOp, ErrBox> {
   let args: PermissionArgs = serde_json::from_value(args)?;
   let permissions = &mut state.permissions.borrow_mut();
   let path = args.path.as_deref();
@@ -87,7 +97,12 @@ pub fn op_request_permission(
     "run" => permissions.request_run(),
     "plugin" => permissions.request_plugin(),
     "hrtime" => permissions.request_hrtime(),
-    n => return Err(OpError::other(format!("No such permission name: {}", n))),
+    n => {
+      return Err(ErrBox::new(
+        "ReferenceError",
+        format!("No such permission name: {}", n),
+      ))
+    }
   };
   Ok(JsonOp::Sync(json!({ "state": perm.to_string() })))
 }